Merge pull request #8362 from tony2001/read_property_crash_fixed

read_property() handler is not supposed to return NULL
4 years ago · 4baed791f5
parent 069f989b48 2e7771d7a0
commit 4baed791f5
1 changed files with 1 additions and 1 deletions
--- 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;
 }