sw/source/filter/ascii/parasc.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 7a831d5139f30bad2468323a74850810ada136cd
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Wed Jul 10 08:31:39 2019 -0400
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 14:12:50 2020 +0200
sw: fail loading when the fallback text detection fails
When we document in question fails to match any known type,
we try to open as plain text (and convert to a Writer doc).
However we should not display non-text when we have failed
to detect ascii or unicode contents in the file.
This happens with corrupted documents, for example, where
we end up displaying non-printable binary data.
Change-Id: Iccc158a4cb6051a8b17ba01987a30a9882a27fa9
Reviewed-on: https://gerrit.libreoffice.org/75512
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
(cherry picked from commit d1f6f27e2a014aa55e2762f1209dc520fb183404)
Reviewed-on: https://gerrit.libreoffice.org/78452
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/82099
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/sw/source/filter/ascii/parasc.cxx
b/sw/source/filter/ascii/parasc.cxx
index cbdae221ed1e..95948041d767 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -260,7 +260,11 @@ ErrCode SwASCIIParser::ReadChars()
nOrig = nLen = rInput.ReadBytes(pArr.get(), ASC_BUFFLEN);
rtl_TextEncoding eCharSet;
LineEnd eLineEnd;
- bool bRet = SwIoSystem::IsDetectableText(pArr.get(), nLen, &eCharSet,
&bSwapUnicode, &eLineEnd);
+ const bool bRet
+ = SwIoSystem::IsDetectableText(pArr.get(), nLen, &eCharSet,
&bSwapUnicode, &eLineEnd);
+ if (!bRet)
+ return ERRCODE_IO_BROKENPACKAGE;
+
OSL_ENSURE(bRet, "Autodetect of text import without nag dialog must
have failed");
if (bRet && eCharSet != RTL_TEXTENCODING_DONTKNOW)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
