fix warning: 'payload' may be used uninitialized in this function (ok, was a false positive)

remicollet · remicollet · commit cb7a7fd65eae · 2014-03-13T10:35:53.000+01:00
diff --git a/php_memcached.c b/php_memcached.c
@@ -1393,7 +1393,7 @@ static void php_memc_store_impl(INTERNAL_FUNCTION_PARAMETERS, int op, zend_bool
 	zval *value;
 	long expiration = 0;
 	long udf_flags = 0;
-	char  *payload;
+	char  *payload = NULL;
 	size_t payload_len;
 	uint32_t flags = 0;
 	uint32_t retry = 0;
@@ -1556,7 +1556,7 @@ static void php_memc_store_impl(INTERNAL_FUNCTION_PARAMETERS, int op, zend_bool
 		RETVAL_TRUE;
 	}
 
-	if (op != MEMC_OP_TOUCH) {
+	if (payload) {
 		efree(payload);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1393,7 +1393,7 @@ static void php_memc_store_impl(INTERNAL_FUNCTION_PARAMETERS, int op, zend_bool`
`1393`	`1393`	`zval *value;`
`1394`	`1394`	`long expiration = 0;`
`1395`	`1395`	`long udf_flags = 0;`
`1396`		`- char *payload;`
	`1396`	`+ char *payload = NULL;`
`1397`	`1397`	`size_t payload_len;`
`1398`	`1398`	`uint32_t flags = 0;`
`1399`	`1399`	`uint32_t retry = 0;`
`@@ -1556,7 +1556,7 @@ static void php_memc_store_impl(INTERNAL_FUNCTION_PARAMETERS, int op, zend_bool`
`1556`	`1556`	`RETVAL_TRUE;`
`1557`	`1557`	`}`
`1558`	`1558`
`1559`		`- if (op != MEMC_OP_TOUCH) {`
	`1559`	`+ if (payload) {`
`1560`	`1560`	`efree(payload);`
`1561`	`1561`	`}`
`1562`	`1562`	`}`