Skip to content

Commit

Permalink
Merge pull request #456 from miaoerduo/master
Browse files Browse the repository at this point in the history
fix: some bugs in detach and replace, resolved #467
  • Loading branch information
Alanscut authored May 6, 2020
2 parents 2a6299d + cb4661c commit a82449f
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions cJSON.c
Original file line number Diff line number Diff line change
Expand Up @@ -1509,6 +1509,10 @@ static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buf
success:
input_buffer->depth--;

if (head != NULL) {
head->prev = current_item;
}

item->type = cJSON_Array;
item->child = head;

Expand Down Expand Up @@ -1681,6 +1685,10 @@ static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_bu
success:
input_buffer->depth--;

if (head != NULL) {
head->prev = current_item;
}

item->type = cJSON_Object;
item->child = head;

Expand Down Expand Up @@ -2202,6 +2210,12 @@ CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const it
/* first element */
parent->child = item->next;
}
else if (item->next == NULL)
{
/* last element */
parent->child->prev = item->prev;
}

/* make sure the detached item doesn't point anywhere anymore */
item->prev = NULL;
item->next = NULL;
Expand Down Expand Up @@ -2299,6 +2313,10 @@ CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON
}
if (parent->child == item)
{
if (parent->child->prev == parent->child)
{
replacement->prev = replacement;
}
parent->child = replacement;
}
else
Expand All @@ -2310,6 +2328,10 @@ CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON
{
replacement->prev->next = replacement;
}
if (replacement->next == NULL)
{
parent->child->prev = replacement;
}
}

item->next = NULL;
Expand Down

0 comments on commit a82449f

Please sign in to comment.