From: Art Cancro <ajc@citadel.org>
Date: Tue, 22 Feb 2011 21:06:36 +0000 (-0500)
Subject: Escape single and double quotes in export format
X-Git-Tag: v8.11~849
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=2b95d70900730dd2913788e01948572069fc1587

Escape single and double quotes in export format
---

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index 5bb59d679..d8a742acd 100644
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -84,8 +84,11 @@ void xml_strout(char *str) {
 	char *c = str;
 
 	while (*c != 0) {
-		if (*c == '&') {
-			client_write("&amp;", 5);
+		if (*c == '\"') {
+			client_write("&quot;", 4);
+		}
+		else if (*c == '\'') {
+			client_write("&apos;", 4);
 		}
 		else if (*c == '<') {
 			client_write("&lt;", 4);
@@ -93,6 +96,9 @@ void xml_strout(char *str) {
 		else if (*c == '>') {
 			client_write("&gt;", 4);
 		}
+		else if (*c == '&') {
+			client_write("&amp;", 5);
+		}
 		else {
 			client_write(c, 1);
 		}