Don't double free the cache key

michael-grunder · michael-grunder · commit cb5d6b948648 · 2019-07-16T17:28:30.000-07:00
Addresses #1591
diff --git a/cluster_library.c b/cluster_library.c
@@ -892,8 +892,8 @@ cluster_free(redisCluster *c, int free_ctx)
     if (c->cache_key) {
         if (c->redirections) {
             zend_hash_del(&EG(persistent_list), c->cache_key);
+            c->cache_key = NULL;
         }
-        zend_string_release(c->cache_key);
     }
 
     /* Free structure itself */
diff --git a/redis.c b/redis.c
@@ -559,8 +559,10 @@ free_reply_callbacks(RedisSock *redis_sock)
 
 /* Passthru for destroying cluster cache */
 static void cluster_cache_dtor(zend_resource *rsrc) {
-    redisCachedCluster *rcc = (redisCachedCluster*)rsrc->ptr;
-    cluster_cache_free(rcc);
+    if (rsrc->ptr) {
+        redisCachedCluster *rcc = (redisCachedCluster*)rsrc->ptr;
+        cluster_cache_free(rcc);
+    }
 }
 
 void

Original file line number	Diff line number	Diff line change
`@@ -892,8 +892,8 @@ cluster_free(redisCluster *c, int free_ctx)`
`892`	`892`	`if (c->cache_key) {`
`893`	`893`	`if (c->redirections) {`
`894`	`894`	`zend_hash_del(&EG(persistent_list), c->cache_key);`
	`895`	`+ c->cache_key = NULL;`
`895`	`896`	`}`
`896`		`- zend_string_release(c->cache_key);`
`897`	`897`	`}`
`898`	`898`
`899`	`899`	`/* Free structure itself */`