diff options
author | Bo Yang <paulyang1211@gmail.com> | 2017-12-11 10:50:50 -0800 |
---|---|---|
committer | Bo Yang <paulyang1211@gmail.com> | 2017-12-11 10:50:50 -0800 |
commit | fc5818b2bbe48f6720410d448c3f5e4afb6bd365 (patch) | |
tree | 6e011c12db409e16767463f0d53aec5ef104bcc6 /php/ext/google/protobuf/message.c | |
parent | cf7c15e31a456f634d4e3deaf4ef74a6bfad825d (diff) | |
parent | 457f6a607ce167132b833c049b0eaf3a9c4b3f5f (diff) | |
download | protobuf-fc5818b2bbe48f6720410d448c3f5e4afb6bd365.tar.gz protobuf-fc5818b2bbe48f6720410d448c3f5e4afb6bd365.tar.bz2 protobuf-fc5818b2bbe48f6720410d448c3f5e4afb6bd365.zip |
Merge branch '3.5.0.1' into 3.5.x
Diffstat (limited to 'php/ext/google/protobuf/message.c')
-rw-r--r-- | php/ext/google/protobuf/message.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c index 6db010c5..b14c1f0c 100644 --- a/php/ext/google/protobuf/message.c +++ b/php/ext/google/protobuf/message.c @@ -379,6 +379,7 @@ PHP_METHOD(Message, whichOneof) { PHP_PROTO_FAKE_SCOPE_BEGIN(LOWER_CLASS##_type); \ zval* value = message_get_property_internal(getThis(), &member TSRMLS_CC); \ PHP_PROTO_FAKE_SCOPE_END; \ + zval_dtor(&member); \ PHP_PROTO_RETVAL_ZVAL(value); \ } \ PHP_METHOD(UPPER_CLASS, set##UPPER_FIELD) { \ @@ -390,6 +391,7 @@ PHP_METHOD(Message, whichOneof) { zval member; \ PHP_PROTO_ZVAL_STRING(&member, LOWER_FIELD, 1); \ message_set_property_internal(getThis(), &member, value TSRMLS_CC); \ + zval_dtor(&member); \ PHP_PROTO_RETVAL_ZVAL(getThis()); \ } @@ -402,6 +404,7 @@ PHP_METHOD(Message, whichOneof) { message_get_oneof_property_internal(getThis(), &member, \ return_value TSRMLS_CC); \ PHP_PROTO_FAKE_SCOPE_END; \ + zval_dtor(&member); \ } \ PHP_METHOD(UPPER_CLASS, set##UPPER_FIELD) { \ zval* value = NULL; \ @@ -412,6 +415,7 @@ PHP_METHOD(Message, whichOneof) { zval member; \ PHP_PROTO_ZVAL_STRING(&member, LOWER_FIELD, 1); \ message_set_property_internal(getThis(), &member, value TSRMLS_CC); \ + zval_dtor(&member); \ PHP_PROTO_RETVAL_ZVAL(getThis()); \ } |