Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix segmentation faults with enabled keep_descriptor_pool_after_request

Browse Source
pull/16993/head
Simon Berger 10 months ago
parent 40ffd46cec
commit 62b5529b6a
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      php/ext/google/protobuf/protobuf.c

12
php/ext/google/protobuf/protobuf.c
Unescape View File

@ -143,11 +143,11 @@ static PHP_GINIT_FUNCTION(protobuf) { protobuf_globals->global_symtab = NULL; }
static PHP_RINIT_FUNCTION(protobuf) { static PHP_RINIT_FUNCTION(protobuf) {
// Create the global generated pool. // Create the global generated pool.
// Reuse the symtab (if any) left to us by the last request. // Reuse the symtab (if any) left to us by the last request.
upb_DefPool* symtab = PROTOBUF_G(global_symtab); if (!PROTOBUF_G(global_symtab)) {
if (!symtab) { zend_bool persistent = PROTOBUF_G(keep_descriptor_pool_after_request);
PROTOBUF_G(global_symtab) = symtab = upb_DefPool_New(); PROTOBUF_G(global_symtab) = upb_DefPool_New();
zend_hash_init(&PROTOBUF_G(name_msg_cache), 64, NULL, NULL, 0); zend_hash_init(&PROTOBUF_G(name_msg_cache), 64, NULL, NULL, persistent);
zend_hash_init(&PROTOBUF_G(name_enum_cache), 64, NULL, NULL, 0); zend_hash_init(&PROTOBUF_G(name_enum_cache), 64, NULL, NULL, persistent);
} }
zend_hash_init(&PROTOBUF_G(object_cache), 64, NULL, NULL, 0); zend_hash_init(&PROTOBUF_G(object_cache), 64, NULL, NULL, 0);
@ -308,7 +308,7 @@ zend_module_entry protobuf_module_entry = {
protobuf_functions, // function list protobuf_functions, // function list
PHP_MINIT(protobuf), // process startup PHP_MINIT(protobuf), // process startup
PHP_MSHUTDOWN(protobuf), // process shutdown PHP_MSHUTDOWN(protobuf), // process shutdown
PHP_RINIT(protobuf), // request shutdown PHP_RINIT(protobuf), // request startup
PHP_RSHUTDOWN(protobuf), // request shutdown PHP_RSHUTDOWN(protobuf), // request shutdown
NULL, // extension info NULL, // extension info
PHP_PROTOBUF_VERSION, // extension version PHP_PROTOBUF_VERSION, // extension version

Write Preview
Loading…
Cancel
Save