protobuf-c.c: Fix a bug when merging optional byte fields

060c0712 · Ilya Lipnitskiy · c6a950c5 · 060c0712
Commit 060c0712 authored Nov 18, 2014 by Ilya Lipnitskiy
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

protobuf-c/protobuf-c.c protobuf-c/protobuf-c.c +1 -1

No files found.
--- a/protobuf-c/protobuf-c.c
+++ b/protobuf-c/protobuf-c.c
@@ -2001,7 +2001,7 @@ merge_messages(ProtobufCMessage *earlier_msg,

 				need_to_merge =
 					(e_data != NULL &&
-					 (d_bd != NULL &&
+					 (d_bd == NULL ||
 					  e_data != d_bd->data)) &&
 					(l_data == NULL ||
 					 (d_bd != NULL &&