return 0;
}
-static int dump_string(const char *str, int ascii, json_dump_callback_t dump, void *data)
+static int dump_string(const char *str, int ascii, json_dump_callback_t dump, void *data, size_t flags)
{
const char *pos, *end;
int32_t codepoint;
switch(codepoint)
{
case '\\': text = "\\\\"; break;
- case '/': text = "\\/"; break;
case '\"': text = "\\\""; break;
case '\b': text = "\\b"; break;
case '\f': text = "\\f"; break;
case '\n': text = "\\n"; break;
case '\r': text = "\\r"; break;
case '\t': text = "\\t"; break;
+ case '/':
+ if (flags & JSON_ESCAPE_SLASH)
+ text = "\\/";
+ else {
+ text = "/";
+ length = 1;
+ }
+ break;
default:
{
/* codepoint is in BMP */
}
case JSON_STRING:
- return dump_string(json_string_value(json), ascii, dump, data);
+ return dump_string(json_string_value(json), ascii, dump, data, flags);
case JSON_ARRAY:
{
value = json_object_get(json, key);
assert(value);
- dump_string(key, ascii, dump, data);
+ dump_string(key, ascii, dump, data, flags);
if(dump(separator, separator_length, data) ||
do_dump(value, flags, depth + 1, dump, data))
{
{
void *next = json_object_iter_next((json_t *)json, iter);
- dump_string(json_object_iter_key(iter), ascii, dump, data);
+ dump_string(json_object_iter_key(iter), ascii, dump, data, flags);
if(dump(separator, separator_length, data) ||
do_dump(json_object_iter_value(iter), flags, depth + 1,
dump, data))
}
+static void escape_slashes()
+{
+ /* Test dump escaping slashes */
+
+ json_t *json;
+ char *result;
+
+ json = json_object();
+ json_object_set_new(json, "url", json_string("https://github.com/akheron/jansson"));
+
+ result = json_dumps(json, 0);
+ if(!result || strcmp(result, "{\"url\": \"https://github.com/akheron/jansson\"}"))
+ fail("json_dumps failed to not escape slashes");
+
+ free(result);
+
+ result = json_dumps(json, JSON_ESCAPE_SLASH);
+ if(!result || strcmp(result, "{\"url\": \"https:\\/\\/github.com\\/akheron\\/jansson\"}"))
+ fail("json_dumps failed to escape slashes");
+
+ free(result);
+ json_decref(json);
+}
+
static void run_tests()
{
encode_twice();
circular_references();
encode_other_than_array_or_object();
+ escape_slashes();
}