mirror/json-c
1
0 Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-11-09 23:40:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

pass the add flag to the array callback for json_patch copy

Browse Source
This commit is contained in:
Javid Khan authored and Eric Hawicz committed 2026-11-08 23:47:51 -05:00
1 parent 0f8fe5dd53
commit 46f0355925
3 files changed
+13 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

json_patch.c
+7 -1
View File
@@ -263,11 +263,13 @@ static int json_patch_apply_move_copy(struct json_object **res,
const char *path, int move, struct json_patch_error *patch_error)
{
json_pointer_set_cb array_set_cb;
void *array_set_priv;
struct json_pointer_get_result from;
struct json_object *jfrom;
struct json_object *value;
const char *from_s;
size_t from_s_len;
int add = 1;
int rc;
if (!json_object_object_get_ex(patch_elem, "from", &jfrom)) {
@@ -331,7 +333,10 @@ static int json_patch_apply_move_copy(struct json_object **res,
_set_err(ENOMEM, "Unable to copy value referenced by 'from' field");
return -1;
}
/* copy is an "add" at the target, and json_object_array_insert_idx_cb()
* reads its priv as the int add flag, not as the "from" result */
array_set_cb = json_object_array_insert_idx_cb;
array_set_priv = &add;
} else {
json_object_get(from.obj);
value = from.obj;
@@ -341,9 +346,10 @@ static int json_patch_apply_move_copy(struct json_object **res,
return rc;
}
array_set_cb = json_object_array_move_cb;
array_set_priv = &from;
}
rc = json_pointer_set_with_cb(res, path, value, array_set_cb, 0, &from);
rc = json_pointer_set_with_cb(res, path, value, array_set_cb, 0, array_set_priv);
if (rc)
{
_set_err(errno, "Failed to set value at path referenced by 'path' field");