From: Enrico Forestieri <forenr@lyx.org>
Date: Sat, 5 Jan 2019 18:17:37 +0000 (+0100)
Subject: Fix bug #4269 and avoid crash with gzipped file
X-Git-Tag: 2.3.3~5
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=33023e68117de9d33b2190e057aefec98725e533;p=lyx.git

Fix bug #4269 and avoid crash with gzipped file

Call gunzip with quoted filenames as they may contain spaces or
other special characters.

In computing the length of the extension, the code does not account
for the prefix "unzipped_", which is added when the zipped filename
does not have one of the extensions "gz", "z", "Z", or "svgz", and
thus the used index is out of bounds. See also this thread:
https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg207360.html

(cherry picked from commit 69726b832b4ed1859d5c9e753c4437c98f5f2966)
(cherry picked from commit 7296e0e6ba8bcd343fb3cdb78c8590fd0864d469)
---

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index c1d9822b93..3e4d423c87 100644
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -586,8 +586,14 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir)
 		// extension removed, because base.eps and base.eps.gz may
 		// have different content but would get the same mangled
 		// name in this case.
+		// Also take into account that if the name of the zipped file
+		// has no zip extension then the name of the unzipped one is
+		// prefixed by "unzipped_".
 		string const base = removeExtension(file.unzippedFileName());
-		string::size_type const ext_len = file_in.length() - base.length();
+		string::size_type const prefix_len =
+			prefixIs(onlyFileName(base), "unzipped_") ? 9 : 0;
+		string::size_type const ext_len =
+			file_in.length() + prefix_len - base.length();
 		mangled[mangled.length() - ext_len] = '.';
 	}
 	FileName const file_out(makeAbsPath(mangled, dir));
diff --git a/status.23x b/status.23x
index 487d9f0414..b55dd8ddfd 100644
--- a/status.23x
+++ b/status.23x
@@ -161,6 +161,9 @@ What's new
 
 - Fix crash when disabling math preview (bug 11498).
 
+- Quote filenames when calling gunzip and avoid a crash when the filename
+  of a compressed file does not end with a proper extension (bug 4269).
+
 
 
 * INTERNALS