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: v7.86~10
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=2156f4b500b1259f3d99093cc7623837007fd581

Escape single and double quotes in export format
(cherry picked from commit cbd9bcf9a70f48fbb6d85b0a8eab837ebe1838ce)
---

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index 9b997e132..4eeb576e5 100644
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -86,8 +86,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);
@@ -95,6 +98,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);
 		}