3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-28 14:48:18 +08:00
Code Issues Projects Releases Wiki Activity

protobuf-c/protobuf-c.c: fix a logic error when a failed merge would

Browse Source 
leave a dangling pointer to the parsed submessage
This commit is contained in:
Ilya Lipnitskiy 2013-11-22 17:35:07 -08:00
parent 7b665e9ce4
commit 746ea972bc
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protobuf-c/protobuf-c.c
View File

@ -1943,12 +1943,10 @@ parse_required_member (ScannedMember *scanned_member,
merge_successful = merge_messages (*pmessage, subm, allocator); merge_successful = merge_messages (*pmessage, subm, allocator);
/* Delete the previous message */ /* Delete the previous message */
protobuf_c_message_free_unpacked (*pmessage, allocator); protobuf_c_message_free_unpacked (*pmessage, allocator);
*pmessage = NULL;
} }
*pmessage = subm;
if (subm == NULL || !merge_successful) if (subm == NULL || !merge_successful)
return 0; return 0;
*pmessage = subm;
return 1; return 1;
} }
} }