Merge pull request #8362 from tony2001/read_property_crash_fixed

read_property() handler is not supposed to return NULL
protocolbuffers · Mar 3, 2021 · 4baed79 · 4baed79
2 parents 069f989 + 2e7771d
commit 4baed79
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c
@@ -334,7 +334,7 @@ static zval *Message_read_property(PROTO_VAL *obj, PROTO_STR *member,
   Message* intern = PROTO_VAL_P(obj);
   const upb_fielddef *f = get_field(intern, member);
 
-  if (!f) return NULL;
+  if (!f) return &EG(uninitialized_zval);
   Message_get(intern, f, rv);
   return rv;
 }