diff options
| author | Jisi Liu <liujisi@google.com> | 2018-01-04 14:26:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 14:26:24 -0800 |
| commit | a3868af12be724f808faa21a29e7b4931e30bed1 (patch) | |
| tree | 3df23c4174287023b569108eb133db0f9c310646 /php/ext/google/protobuf/def.c | |
| parent | eca1d2a7113b3d57f900f69661342c0078c956c4 (diff) | |
| parent | ec826c5a592126ddb6b12b47e6e1fb6232ce340d (diff) | |
| download | protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.tar.gz protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.tar.bz2 protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.zip | |
Merge pull request #4131 from pherl/merge
Merge 3.5.x branch into master
Diffstat (limited to 'php/ext/google/protobuf/def.c')
| -rw-r--r-- | php/ext/google/protobuf/def.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/php/ext/google/protobuf/def.c b/php/ext/google/protobuf/def.c index 13f7cdd6..8140fe47 100644 --- a/php/ext/google/protobuf/def.c +++ b/php/ext/google/protobuf/def.c @@ -249,9 +249,11 @@ PHP_METHOD(Descriptor, getField) { MAKE_STD_ZVAL(field_hashtable_value); ZVAL_OBJ(field_hashtable_value, field_descriptor_type->create_object( field_descriptor_type TSRMLS_CC)); + Z_DELREF_P(field_hashtable_value); #else field_hashtable_value = field_descriptor_type->create_object(field_descriptor_type TSRMLS_CC); + --GC_REFCOUNT(field_hashtable_value); #endif FieldDescriptor *field_php = UNBOX_HASHTABLE_VALUE(FieldDescriptor, field_hashtable_value); |