[processing] correctly escape parentheses in GDAL command (fix #39525)

qgis · Oct 28, 2020 · 8d7f8ed · 8d7f8ed
1 parent 4af1cbf
commit 8d7f8ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/python/plugins/processing/algs/gdal/GdalUtils.py b/python/plugins/processing/algs/gdal/GdalUtils.py
@@ -217,11 +217,12 @@ def getFormatShortNameFromFilename(filename):
 
     @staticmethod
     def escapeAndJoin(strList):
+        escChars = [' ', '&', '(', ')']
         joined = ''
         for s in strList:
             if not isinstance(s, str):
                 s = str(s)
-            if s and s[0] != '-' and (' ' in s or '&' in s):
+            if s and s[0] != '-' and any(c in s for c in escChars):
                 escaped = '"' + s.replace('\\', '\\\\').replace('"', '\\"') \
                           + '"'
             else:

diff --git a/python/plugins/processing/tests/GdalAlgorithmsGeneralTest.py b/python/plugins/processing/tests/GdalAlgorithmsGeneralTest.py
@@ -349,7 +349,7 @@ def testCrsConversion(self):
                              '+proj=utm +zone=36 +south      +a=600000 +b=70000       +towgs84=-143,-90,-294,0,0,0,0 +units=m +no_defs')
 
     def testEscapeAndJoin(self):
-        self.assertEqual(GdalUtils.escapeAndJoin([1, "a", "a b", "a&b"]), '1 a "a b" "a&b"')
+        self.assertEqual(GdalUtils.escapeAndJoin([1, "a", "a b", "a&b", "a(b)"]), '1 a "a b" "a&b" "a(b)"')
 
 
 if __name__ == '__main__':