FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

json_dump*(): Don't crash if json is NULL and JSON_ENCODE_ANY is set

Browse Source
This commit is contained in:
Petri Lehtinen 2013-04-15 08:42:23 +03:00
parent bbd3b0ca4f
commit 867079c820
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dump.c
View File

@ -171,6 +171,9 @@ static int object_key_compare_serials(const void *key1, const void *key2)
static int do_dump(const json_t *json, size_t flags, int depth,
json_dump_callback_t dump, void *data)
{
if(!json)
return -1;
switch(json_typeof(json)) {
case JSON_NULL:
return dump("null", 4, data);

21
test/suites/api/test_dump.c
View File

@ -9,6 +9,26 @@
#include <string.h>
#include "util.h"
static int encode_null_callback(void *ptr, size_t size, void *data)
{
return 0;
}
static void encode_null()
{
if(json_dumps(NULL, JSON_ENCODE_ANY) != NULL)
fail("json_dumps didn't fail for NULL");
if(json_dumpf(NULL, stderr, JSON_ENCODE_ANY) != -1)
fail("json_dumpf didn't fail for NULL");
/* Don't test json_dump_file to avoid creating a file */
if(json_dump_callback(NULL, encode_null_callback, NULL, JSON_ENCODE_ANY) != -1)
fail("json_dump_callback didn't fail for NULL");
}
static void encode_twice()
{
/* Encode an empty object/array, add an item, encode again */
@ -159,6 +179,7 @@ static void escape_slashes()
static void run_tests()
{
encode_null();
encode_twice();
circular_references();
encode_other_than_array_or_object();