PCBC-332: Correct various memory leaks.

Author: brett19

bucket.c

@@ -75,6 +75,10 @@ void bucket_free_storage(void *object TSRMLS_DC)
 	zend_hash_destroy(obj->std.properties);
 	FREE_HASHTABLE(obj->std.properties);
 
+	zval_ptr_dtor(&obj->encoder);
+	zval_ptr_dtor(&obj->decoder);
+	zval_ptr_dtor(&obj->prefix);
+
 	efree(obj);
 }
 
@@ -88,18 +92,20 @@ zend_object_value bucket_create_handler(zend_class_entry *type TSRMLS_DC)
 	obj->conn = NULL;
 
 	MAKE_STD_ZVAL(obj->encoder);
-	ZVAL_STRING(obj->encoder, "", 1);
+	ZVAL_EMPTY_STRING(obj->encoder);
 	MAKE_STD_ZVAL(obj->decoder);
-	ZVAL_STRING(obj->decoder, "", 1);
+	ZVAL_EMPTY_STRING(obj->decoder);
 	MAKE_STD_ZVAL(obj->prefix);
-	ZVAL_STRING(obj->prefix, "", 1);
+	ZVAL_EMPTY_STRING(obj->prefix);
 
 	ALLOC_HASHTABLE(obj->std.properties);
 	zend_hash_init(obj->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
 	phlp_object_properties_init(&obj->std, type);
 
-	retval.handle = zend_objects_store_put(obj, NULL,
-			bucket_free_storage, NULL TSRMLS_CC);
+	retval.handle = zend_objects_store_put(obj,
+	        (zend_objects_store_dtor_t)zend_objects_destroy_object,
+	        (zend_objects_free_object_storage_t)bucket_free_storage,
+			NULL TSRMLS_CC);
 	retval.handlers = &bucket_handlers;
 
 	return retval;
@@ -437,6 +443,9 @@ PHP_METHOD(Bucket, insert)
 	pcbc_wait(data TSRMLS_CC);
 
 	bopcookie_destroy(cookie);
+    for (ii = 0; ii < num_cmds; ++ii) {
+        efree((void*)cmds[ii]->v.v0.bytes);
+    }
 	efree(cmds);
 	efree(cmd);
 }
@@ -496,6 +505,9 @@ PHP_METHOD(Bucket, upsert)
 	pcbc_wait(data TSRMLS_CC);
 
 	bopcookie_destroy(cookie);
+	for (ii = 0; ii < num_cmds; ++ii) {
+	    efree((void*)cmds[ii]->v.v0.bytes);
+	}
 	efree(cmds);
 	efree(cmd);
 }
@@ -559,6 +571,9 @@ PHP_METHOD(Bucket, replace)
 	pcbc_wait(data TSRMLS_CC);
 
 	bopcookie_destroy(cookie);
+    for (ii = 0; ii < num_cmds; ++ii) {
+        efree((void*)cmds[ii]->v.v0.bytes);
+    }
 	efree(cmds);
 	efree(cmd);
 }
@@ -617,6 +632,9 @@ PHP_METHOD(Bucket, append)
 	pcbc_wait(data TSRMLS_CC);
 
 	bopcookie_destroy(cookie);
+    for (ii = 0; ii < num_cmds; ++ii) {
+        efree((void*)cmds[ii]->v.v0.bytes);
+    }
 	efree(cmds);
 	efree(cmd);
 }
@@ -675,6 +693,9 @@ PHP_METHOD(Bucket, prepend)
 	pcbc_wait(data TSRMLS_CC);
 
 	bopcookie_destroy(cookie);
+    for (ii = 0; ii < num_cmds; ++ii) {
+        efree((void*)cmds[ii]->v.v0.bytes);
+    }
 	efree(cmds);
 	efree(cmd);
 }
@@ -1090,11 +1111,11 @@ PHP_METHOD(Bucket, setTranscoder)
 		RETURN_NULL();
 	}
 
-	FREE_ZVAL(data->encoder);
+	zval_ptr_dtor(&data->encoder);
 	MAKE_STD_ZVAL(data->encoder);
 	ZVAL_ZVAL(data->encoder, zencoder, 1, NULL);
 
-	FREE_ZVAL(data->decoder);
+	zval_ptr_dtor(&data->decoder);
 	MAKE_STD_ZVAL(data->decoder);
 	ZVAL_ZVAL(data->decoder, zdecoder, 1, NULL);
 

cas.c

@@ -3,8 +3,16 @@
 
 int le_cas;
 
+static void cas_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+    lcb_cas_t *cas_data = (lcb_cas_t*)rsrc->ptr;
+    if (cas_data) {
+        efree(cas_data);
+    }
+}
+
 void couchbase_init_cas(INIT_FUNC_ARGS) {
-	le_cas = zend_register_list_destructors_ex(NULL, NULL, "CouchbaseCAS", module_number);
+	le_cas = zend_register_list_destructors_ex(cas_dtor, NULL, "CouchbaseCAS", module_number);
 }
 
 lcb_cas_t cas_retrieve(zval * zcas TSRMLS_DC) {

couchbase.c

@@ -93,7 +93,7 @@ PHP_MINIT_FUNCTION(couchbase)
 	return SUCCESS;
 }
 
-PHP_MSHUTDOWN_FUNCTION(couchbsae)
+PHP_MSHUTDOWN_FUNCTION(couchbase)
 {
 	couchbase_shutdown_bucket(SHUTDOWN_FUNC_ARGS_PASSTHRU);
 
@@ -133,7 +133,7 @@ zend_module_entry couchbase_module_entry = {
 	PHP_COUCHBASE_EXTNAME,
 	NULL,
 	PHP_MINIT(couchbase),
-	NULL,
+	PHP_MSHUTDOWN(couchbase),
 	PHP_RINIT(couchbase),
 	NULL,
 	NULL,

metadoc.c

@@ -40,9 +40,11 @@ int metadoc_create(zval *doc, zval *value, lcb_cas_t cas,
 	MAKE_STD_ZVAL(zflags);
 	ZVAL_LONG(zflags, flags);
 	zend_update_property(metadoc_ce, doc, "flags", sizeof("flags") - 1, zflags TSRMLS_CC);
+	zval_ptr_dtor(&zflags);
 
 	zcas = cas_create(cas TSRMLS_CC);
 	zend_update_property(metadoc_ce, doc, "cas", sizeof("cas") - 1, zcas TSRMLS_CC);
+	zval_ptr_dtor(&zcas);
 
 	return SUCCESS;
 }
@@ -59,8 +61,12 @@ int metadoc_from_long(zval *doc, lcb_U64 value,
 int metadoc_from_bytes(bucket_object *obj, zval *doc, const void *bytes,
 	lcb_size_t nbytes, lcb_cas_t cas, lcb_uint32_t flags,
 	lcb_uint8_t datatype TSRMLS_DC) {
-	zval *zvalue;
+	int retval;
+    zval *zvalue;
 	pcbc_bytes_to_zval(obj, &zvalue, bytes, nbytes, flags, datatype TSRMLS_CC);
 
-	return metadoc_create(doc, zvalue, cas, flags, datatype TSRMLS_CC);
+	retval = metadoc_create(doc, zvalue, cas, flags, datatype TSRMLS_CC);
+
+	zval_ptr_dtor(&zvalue);
+	return retval;
 }

transcoding.c

@@ -24,6 +24,10 @@ int pcbc_bytes_to_zval(bucket_object *obj, zval **zvalue, const void *bytes,
 		return FAILURE;
 	}
 
+	zval_dtor(&zbytes);
+	zval_dtor(&zflags);
+	zval_dtor(&zdatatype);
+
 	return SUCCESS;
 }
 
@@ -59,10 +63,12 @@ int pcbc_zval_to_bytes(bucket_object *obj, zval *value,
 		return FAILURE;
 	}
 
-	*bytes = Z_STRVAL_PP(zpbytes);
 	*nbytes = Z_STRLEN_PP(zpbytes);
+	*bytes = estrndup(Z_STRVAL_PP(zpbytes), *nbytes);
 	*flags = Z_LVAL_PP(zpflags);
 	*datatype = (lcb_uint8_t)Z_LVAL_PP(zpdatatype);
 
+	zval_dtor(&zretval);
+
 	return SUCCESS;
 }