Fixing serializer initialization and destruction in PHP 5.4.

maxbeutel · nicolasff · commit 158d90b03505 · 2012-05-29T22:18:58.000+01:00
diff --git a/library.c b/library.c
@@ -1286,13 +1286,15 @@ redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_
 		case REDIS_SERIALIZER_PHP:
 
 #if ZEND_MODULE_API_NO >= 20100000
+			PHP_VAR_SERIALIZE_INIT(ht);
 #else
 			zend_hash_init(&ht, 10, NULL, NULL, 0);
 #endif
 			php_var_serialize(&sstr, &z, &ht TSRMLS_CC);
 			*val = sstr.c;
 			*val_len = (int)sstr.len;
 #if ZEND_MODULE_API_NO >= 20100000
+			PHP_VAR_SERIALIZE_DESTROY(ht);
 #else
 			zend_hash_destroy(&ht);
 #endif
@@ -1324,15 +1326,23 @@ redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **re
 			if(!*return_value) {
 				MAKE_STD_ZVAL(*return_value);
 			}
+#if ZEND_MODULE_API_NO >= 20100000
+			PHP_VAR_UNSERIALIZE_INIT(var_hash);
+#else
 			memset(&var_hash, 0, sizeof(var_hash));
+#endif
 			if(!php_var_unserialize(return_value, (const unsigned char**)&val,
 					(const unsigned char*)val + val_len, &var_hash TSRMLS_CC)) {
 				efree(*return_value);
 				ret = 0;
 			} else {
 				ret = 1;
 			}
+#if ZEND_MODULE_API_NO >= 20100000
+			PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
+#else
 			var_destroy(&var_hash);
+#endif
 
 			return ret;
 
