escape_json_attr: don't escape single quotes

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/common/escape.c b/src/common/escape.c
index cb4076be151f0bdf69b741e81234d58813e2853d..3249df11b97f3b4ae3253ef9488db4e3c460117c 100644 (file)
--- a/src/common/escape.c
+++ b/src/common/escape.c
@@ -112,7 +112,6 @@ void escape_xml_attr(const char *buf, char *out)
        *o = '\0';
 }
 
-#define SGL_QUOTE_JESCAPE "\\'"
 #define DBL_QUOTE_JESCAPE "\\\""
 #define BACKSLASH_JESCAPE "\\\\"
 #define SLASH_JESCAPE "\\/"
@@ -126,9 +125,6 @@ int escape_json_attr_len(const char *buf)
        for (b = buf; *b; ++b) {
                unsigned char c = *b;
                switch (c) {
-               case '\'':
-                       ret += SSTRL(SGL_QUOTE_JESCAPE);
-                       break;
                case '"':
                        ret += SSTRL(DBL_QUOTE_JESCAPE);
                        break;
@@ -166,10 +162,6 @@ void escape_json_attr(const char *buf, char *out)
        for (b = buf; *b; ++b) {
                unsigned char c = *b;
                switch (c) {
-               case '\'':
-                       memcpy(o, SGL_QUOTE_JESCAPE, SSTRL(SGL_QUOTE_JESCAPE));
-                       o += SSTRL(SGL_QUOTE_JESCAPE);
-                       break;
                case '"':
                        memcpy(o, DBL_QUOTE_JESCAPE, SSTRL(DBL_QUOTE_JESCAPE));
                        o += SSTRL(DBL_QUOTE_JESCAPE);

diff --git a/src/test/escape.cc b/src/test/escape.cc
index f494e9a1866cb3c391bdf5ba6d2f2b68e30f772a..747b7d845197875f7bc2bbb925d25adce956534b 100644 (file)
--- a/src/test/escape.cc
+++ b/src/test/escape.cc
@@ -76,7 +76,7 @@ TEST(EscapeJson, Escapes1) {
       "JSON calls a slash / backslash a solidus / reverse solidus"),
       "JSON calls a slash \\/ backslash a solidus \\/ reverse solidus");
   ASSERT_EQ(escape_json_attrs("Some 'single' \"quotes\" here"),
-      "Some \\'single\\' \\\"quotes\\\" here");
+      "Some 'single' \\\"quotes\\\" here");
   ASSERT_EQ(escape_json_attrs("tabs\tand\tnewlines\n, oh my"),
       "tabs\\tand\\tnewlines\\n, oh my");
 }