Correctly escape more json strings

qgis · May 9, 2016 · 819ed86 · 819ed86
1 parent 729c703
commit 819ed86
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/core/qgsjsonutils.cpp b/src/core/qgsjsonutils.cpp
@@ -113,9 +113,15 @@ QString QgsJSONUtils::encodeValue( const QVariant &value )
 
     default:
     case QVariant::String:
-      QString v = value.toString().replace( '"', "\\\"" )
+      QString v = value.toString()
+                  .replace( '\\', "\\\\" )
+                  .replace( '"', "\\\"" )
                   .replace( '\r', "\\r" )
+                  .replace( '\b', "\\b" )
+                  .replace( '\t', "\\t" )
+                  .replace( '/', "\\/" )
                   .replace( '\n', "\\n" );
+
       return v.prepend( '"' ).append( '"' );
   }
 }
diff --git a/tests/src/python/test_qgsjsonutils.py b/tests/src/python/test_qgsjsonutils.py
@@ -92,7 +92,12 @@ def testEncodeValue(self):
         self.assertEqual(QgsJSONUtils.encodeValue('string'), '"string"')
         self.assertEqual(QgsJSONUtils.encodeValue('str\ning'), '"str\\ning"')
         self.assertEqual(QgsJSONUtils.encodeValue('str\ring'), '"str\\ring"')
-        self.assertEqual(QgsJSONUtils.encodeValue('str"ing'), '"str\\"ing"')
+        self.assertEqual(QgsJSONUtils.encodeValue('str\bing'), '"str\\bing"')
+        self.assertEqual(QgsJSONUtils.encodeValue('str\ting'), '"str\\ting"')
+        self.assertEqual(QgsJSONUtils.encodeValue('str\\ing'), '"str\\\\ing"')
+        self.assertEqual(QgsJSONUtils.encodeValue('str\\ning'), '"str\\\\ning"')
+        self.assertEqual(QgsJSONUtils.encodeValue('str\n\\\\ing'), '"str\\n\\\\\\\\ing"')
+        self.assertEqual(QgsJSONUtils.encodeValue('str/ing'), '"str\\/ing"')
 
     def testFeatureToGeoJSON(self):
         """ test converting features to GeoJSON """