Protect against a memory leak if we're serializing HMSET values

michael-grunder · michael-grunder · commit 1710419b4fc3 · 2015-05-08T15:29:19.000-07:00
diff --git a/redis_commands.c b/redis_commands.c
@@ -1596,12 +1596,14 @@ int redis_hmset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
         }
 
         // Serialize value (if directed)
-        val_free = redis_serialize(redis_sock, *z_val, &val, &val_len
-            TSRMLS_CC);
+        val_free = redis_serialize(redis_sock, *z_val, &val, &val_len TSRMLS_CC);
 
         // Append the key and value to our command
         redis_cmd_append_sstr(&cmdstr, mem, mem_len);
         redis_cmd_append_sstr(&cmdstr, val, val_len);
+
+        // Free our value if we serialized it
+        if (val_free) STR_FREE(val);
     }
 
     // Set slot if directed

Original file line number	Diff line number	Diff line change
`@@ -1596,12 +1596,14 @@ int redis_hmset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,`
`1596`	`1596`	`}`
`1597`	`1597`
`1598`	`1598`	`// Serialize value (if directed)`
`1599`		`- val_free = redis_serialize(redis_sock, *z_val, &val, &val_len`
`1600`		`- TSRMLS_CC);`
	`1599`	`+ val_free = redis_serialize(redis_sock, *z_val, &val, &val_len TSRMLS_CC);`
`1601`	`1600`
`1602`	`1601`	`// Append the key and value to our command`
`1603`	`1602`	`redis_cmd_append_sstr(&cmdstr, mem, mem_len);`
`1604`	`1603`	`redis_cmd_append_sstr(&cmdstr, val, val_len);`
	`1604`	`+`
	`1605`	`+ // Free our value if we serialized it`
	`1606`	`+ if (val_free) STR_FREE(val);`
`1605`	`1607`	`}`
`1606`	`1608`
`1607`	`1609`	`// Set slot if directed`