escape backslashes in mapfile string writer (#4747)

MapServer · Sep 1, 2013 · 2505f4e · 2505f4e
1 parent 8ca7e15
commit 2505f4e
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/mapfile.c b/mapfile.c
@@ -554,23 +554,30 @@ static void writeCharacter(FILE *stream, int indent, const char *name, const cha
 
 static void writeString(FILE *stream, int indent, const char *name, const char *defaultString, char *string)
 {
-  char *string_tmp;
+  char *string_escaped;
 
   if(!string) return;
   if(defaultString && strcmp(string, defaultString) == 0) return;
   writeIndent(stream, ++indent);
   if(name) msIO_fprintf(stream, "%s ", name);
-  if ( (strchr(string, '\'') == NULL) && (strchr(string, '\"') == NULL))
+  if(strchr(string,'\\')) {
-    msIO_fprintf(stream, "\"%s\"\n", string);
+    string_escaped = msStrdup(string);
-  else if ( (strchr(string, '\"') != NULL) && (strchr(string, '\'') == NULL))
+    string_escaped = msReplaceSubstring(string_escaped,"\\","\\\\");
-    msIO_fprintf(stream, "'%s'\n", string);
+  } else {
-  else if ( (strchr(string, '\'') != NULL) && (strchr(string, '\"') == NULL))
+    string_escaped = string;
-    msIO_fprintf(stream, "\"%s\"\n", string);
+  }
+  if ( (strchr(string_escaped, '\'') == NULL) && (strchr(string_escaped, '\"') == NULL))
+    msIO_fprintf(stream, "\"%s\"\n", string_escaped);
+  else if ( (strchr(string_escaped, '\"') != NULL) && (strchr(string_escaped, '\'') == NULL))
+    msIO_fprintf(stream, "'%s'\n", string_escaped);
+  else if ( (strchr(string_escaped, '\'') != NULL) && (strchr(string_escaped, '\"') == NULL))
+    msIO_fprintf(stream, "\"%s\"\n", string_escaped);
   else {
-    string_tmp = msStringEscape(string);
+    char *string_tmp = msStringEscape(string_escaped);
     msIO_fprintf(stream, "\"%s\"\n", string_tmp);
-    if(string!=string_tmp) free(string_tmp);
+    if(string_escaped!=string_tmp) free(string_tmp);
   }
+  if(string_escaped!=string) free(string_escaped);
 }
 
 static void writeNumberOrString(FILE *stream, int indent, const char *name, double defaultNumber, double number, char *string)