diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-07-14 15:48:48 -0600 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-07-14 15:48:48 -0600 |
| commit | c78dbd7c895b8c80cd2f2401d73acf890edf82c6 (patch) | |
| tree | 98c59f78325ec539b843505a7e9389be97dc6035 /php/ext/google/protobuf/protobuf.h | |
| parent | ec3f5dcc725c415cf6bbc8325adf731370a3507d (diff) | |
Initial value in generated code cannot be used by c extension. (#3367)
In the generated code of previous versions, each php field is given an
initial value. In c extension, it was assumed that the field order in
the generated code is consistent with upb fields order, so that the
correct initial value can be bound to the correct upb field. However,
this may not be true. The order of fields in generated code is decided
by proto compiler, while the order of upb fields is decided by the hash
function used in c extension.
This PR fixes the issue by reset the initial value at runtime.
Diffstat (limited to 'php/ext/google/protobuf/protobuf.h')
| -rw-r--r-- | php/ext/google/protobuf/protobuf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 684a9c50..eecae136 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -640,7 +640,7 @@ bool native_slot_set(upb_fieldtype_t type, const zend_class_entry* klass, bool native_slot_set_by_array(upb_fieldtype_t type, const zend_class_entry* klass, void* memory, zval* value TSRMLS_DC); -void native_slot_init(upb_fieldtype_t type, void* memory, void* cache); +void native_slot_init(upb_fieldtype_t type, void* memory, CACHED_VALUE* cache); // For each property, in order to avoid conversion between the zval object and // the actual data type during parsing/serialization, the containing message // object use the custom memory layout to store the actual data type for each |