mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-24 15:39:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '2be921d88376e78f84d79aafa6db2714da804e59'

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2015-12-08 20:51:06 -06:00
parent 65be8275da 2be921d883
commit 980cdd61be
4 changed files with 73 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
json_object.c
View File

@@ -444,7 +444,7 @@ void json_object_object_add_ex(struct json_object* jso,
existing_entry->v = val;
}
void json_object_object_add(struct json_object* jso, const char *key,
int json_object_object_add(struct json_object* jso, const char *key,
struct json_object *val)
{
// We lookup the entry and replace the value, rather than just deleting
@@ -455,13 +455,18 @@ void json_object_object_add(struct json_object* jso, const char *key,
existing_entry = lh_table_lookup_entry_w_hash(jso->o.c_object, (void*)key, hash);
if (!existing_entry)
{
lh_table_insert_w_hash(jso->o.c_object, strdup(key), val, hash, 0);
return;
char *keydup = strdup(key);
if (keydup == NULL)
return -1;
return lh_table_insert_w_hash(jso->o.c_object, keydup, val, hash, 0);
}
existing_value = (json_object *)existing_entry->v;
if (existing_value)
json_object_put(existing_value);
existing_entry->v = val;
return 0;
}