PCBC-335: Correct segfault caused by recent memory leak cleanup.

brett19 · brett19 · commit c1ef729d0f37 · 2015-03-23T13:23:25.000-03:00
diff --git a/transcoding.c b/transcoding.c
@@ -9,7 +9,7 @@ int pcbc_bytes_to_zval(bucket_object *obj, zval **zvalue, const void *bytes,
 	if (nbytes > 0) {
 	    ZVAL_STRINGL(&zbytes, bytes, nbytes, 0);
 	} else {
-	    ZVAL_EMPTY_STRING(&zbytes);
+	    ZVAL_STRINGL(&zbytes, "", 0, 0);
 	}
 
 	INIT_ZVAL(zflags);
@@ -24,10 +24,6 @@ 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ int pcbc_bytes_to_zval(bucket_object obj, zval zvalue, const void bytes,`
`9`	`9`	`if (nbytes > 0) {`
`10`	`10`	`ZVAL_STRINGL(&zbytes, bytes, nbytes, 0);`
`11`	`11`	`} else {`
`12`		`- ZVAL_EMPTY_STRING(&zbytes);`
	`12`	`+ ZVAL_STRINGL(&zbytes, "", 0, 0);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`INIT_ZVAL(zflags);`
`@@ -24,10 +24,6 @@ int pcbc_bytes_to_zval(bucket_object obj, zval zvalue, const void bytes,`
`24`	`24`	`return FAILURE;`
`25`	`25`	`}`
`26`	`26`
`27`		`- zval_dtor(&zbytes);`
`28`		`- zval_dtor(&zflags);`
`29`		`- zval_dtor(&zdatatype);`
`30`		`-`
`31`	`27`	`return SUCCESS;`
`32`	`28`	`}`
`33`	`29`