Quote args passed to convertDefault.sh

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9822 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index bb11f797738e97a8e7e21ae89b53ac92d905364a..eab081db17870b6958a3ba3b7e69e1d706eecad8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-17  Angus Leeming  <leeming@lyx.org>
+
+       * converter.C (convert): protect all args of convertDefault.sh
+       script with quotes.
+
 2005-04-11  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * text3.C (dispatch): change the layout to "Caption" after inserting

diff --git a/src/converter.C b/src/converter.C
index 1784d915cd4f4cfb4d53486774415879919f9c78..79feb70ffeb02e61af370d81acdfb40f55b49592 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -295,10 +295,13 @@ bool Converters::convert(Buffer const * buffer,
                        // if no special converter defined, then we take the
                        // default one from ImageMagic.
                        string const from_ext = formats.extension(from_format);
-                       string const command = "sh " +
-                               LibFileSearch("scripts", "convertDefault.sh") +
-                               ' ' + from_ext + ':' + from_file +
-                               ' ' + to_ext   + ':' + to_file;
+                       string const command =
+                               "sh " +
+                               QuoteName(LibFileSearch("scripts", "convertDefault.sh")) +
+                               ' ' +
+                               QuoteName(from_ext + ':' + from_file) +
+                               ' ' +
+                               QuoteName(to_ext + ':' + to_file);
                        lyxerr[Debug::FILES]
                                << "No converter defined! "
                                   "I use convertDefault.sh:\n\t"