Skip to content

Commit def716a

Browse files
committed
Merge pull request #157 from m6w6/foreign-serializer-crash
Fix crashes with foreign serializers
2 parents c157d8a + 657e373 commit def716a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Diff for: php_memcached.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ static void php_memc_getMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
838838
memcpy (res_key, tmp_key, res_key_len >= MEMCACHED_MAX_KEY ? MEMCACHED_MAX_KEY - 1 : res_key_len);
839839
res_key [res_key_len] = '\0';
840840

841-
MAKE_STD_ZVAL(value);
841+
ALLOC_INIT_ZVAL(value);
842842

843843
if (php_memc_zval_from_payload(value, payload, payload_len, flags, m_obj->serializer TSRMLS_CC) < 0) {
844844
zval_ptr_dtor(&value);
@@ -1057,7 +1057,7 @@ PHP_METHOD(Memcached, fetch)
10571057
res_key_len = memcached_result_key_length(&result);
10581058
cas = memcached_result_cas(&result);
10591059

1060-
MAKE_STD_ZVAL(value);
1060+
ALLOC_INIT_ZVAL(value);
10611061

10621062
if (php_memc_zval_from_payload(value, payload, payload_len, flags, m_obj->serializer TSRMLS_CC) < 0) {
10631063
memcached_result_free(&result);
@@ -1114,7 +1114,7 @@ PHP_METHOD(Memcached, fetchAll)
11141114
res_key_len = memcached_result_key_length(&result);
11151115
cas = memcached_result_cas(&result);
11161116

1117-
MAKE_STD_ZVAL(value);
1117+
ALLOC_INIT_ZVAL(value);
11181118

11191119
if (php_memc_zval_from_payload(value, payload, payload_len, flags, m_obj->serializer TSRMLS_CC) < 0) {
11201120
memcached_result_free(&result);
@@ -3663,7 +3663,7 @@ static int php_memc_do_result_callback(zval *zmemc_obj, zend_fcall_info *fci,
36633663
res_key_len = memcached_result_key_length(result);
36643664
cas = memcached_result_cas(result);
36653665

3666-
MAKE_STD_ZVAL(value);
3666+
ALLOC_INIT_ZVAL(value);
36673667

36683668
i_obj = (php_memc_t *) zend_object_store_get_object(zmemc_obj TSRMLS_CC);
36693669

0 commit comments

Comments
 (0)