Skip to content

Fix: heap-use-after-free in merge_patch when target is not an object and contains patch (Variant of what #1060 fixed) #1109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Oculytic wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −1
Open

Fix: heap-use-after-free in merge_patch when target is not an object and contains patch (Variant of what #1060 fixed) #1109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion cJSON_Utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,8 +1335,20 @@ static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_

if (!cJSON_IsObject(target))
{
/* The patch may be part of target: deleting target would free it.
* Work from a copy, as for non-object patches above. */
cJSON *patch_copy = cJSON_Duplicate(patch, 1);
cJSON *result = cJSON_CreateObject();
if ((patch_copy == NULL) || (result == NULL))
{
cJSON_Delete(patch_copy);
cJSON_Delete(result);
return NULL;
}
cJSON_Delete(target);
target = cJSON_CreateObject();
result = merge_patch(result, patch_copy, case_sensitive);
cJSON_Delete(patch_copy);
return result;
}

patch_child = patch->child;
Expand Down