Skip to content

P
protobuf-c
Commit 060c0712 authored by Ilya Lipnitskiy's avatar Ilya Lipnitskiy
Browse files
Options

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

parent c6a950c5
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
protobuf-c/protobuf-c.c
View file @ 060c0712
...@@ -2001,7 +2001,7 @@ merge_messages(ProtobufCMessage *earlier_msg, ...@@ -2001,7 +2001,7 @@ merge_messages(ProtobufCMessage *earlier_msg,
need_to_merge = need_to_merge =
(e_data != NULL && (e_data != NULL &&
(d_bd != NULL && (d_bd == NULL ||
e_data != d_bd->data)) && e_data != d_bd->data)) &&
(l_data == NULL || (l_data == NULL ||
(d_bd != NULL && (d_bd != NULL &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment