Skip to content

RDKB-65508, RDKB-65530: Crash with cJSON_Delete as signature #1236

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
Raju-krish wants to merge 1 commit into
base: main
Choose a base branch
from
Open

RDKB-65508, RDKB-65530: Crash with cJSON_Delete as signature #1236

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
8 changes: 6 additions & 2 deletions source/platform/common/data_model/wifi_dml_json_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,12 @@ static cJSON* merge_with_references(cJSON* base, cJSON* ref_node)
cJSON* existing = cJSON_GetObjectItem(base, child->string);

if (!existing) {
/* Key doesn't exist - add reference */
cJSON_AddItemReferenceToObject(base, child->string, child);
/* Deep copy instead of reference to avoid dangling child pointer
when follow_ref_if_any deletes $ref through the wrapper */
cJSON* copy = cJSON_Duplicate(child, 1);
if (copy) {
cJSON_AddItemToObject(base, child->string, copy);
}
Comment on lines +181 to +184
} else if (strcmp(child->string, "properties") == 0 &&
cJSON_IsObject(existing) && cJSON_IsObject(child)) {
/* Both have "properties" object - recursively merge them */
Expand Down
Loading