Issue #1591 (#1592)

yatsukhnenko · michael-grunder · commit 52764748121b · 2019-07-05T09:44:00.000-07:00
* Issue #1591 * Add notes to Changelog
diff --git a/Changelog.md b/Changelog.md
@@ -5,6 +5,15 @@ All changes to phpredis will be documented in this file.
 We're basing this format on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and PhpRedis adhears to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- RedisCluster segfaults after second connection with cache_slots enabled [f52cd237](https://github.com/phpredis/phpredis/pull/1592/commits/f52cd237)
+  ([Pavlo Yatsukhnenko](https://github.com/yatsukhnenko))
+
+---
+
 ## [5.0.0] - 2019-07-02 ([GitHub](https://github.com/phpredis/phpredis/releases/tag/5.0.0), [PECL](https://pecl.php.net/package/redis/5.0.0))
 
 This release contains important improvements and breaking changes.  The most
diff --git a/cluster_library.c b/cluster_library.c
@@ -1266,9 +1266,11 @@ PHP_REDIS_API void cluster_disconnect(redisCluster *c, int force TSRMLS_DC) {
 
         /* We also want to disconnect any slave connections so they will be pooled
          * in the event we are using persistent connections and connection pooling. */
-        ZEND_HASH_FOREACH_PTR(node->slaves, slave) {
-            redis_sock_disconnect(slave->sock, force TSRMLS_CC);
-        } ZEND_HASH_FOREACH_END();
+        if (node->slaves) {
+            ZEND_HASH_FOREACH_PTR(node->slaves, slave) {
+                redis_sock_disconnect(slave->sock, force TSRMLS_CC);
+            } ZEND_HASH_FOREACH_END();
+        }
     } ZEND_HASH_FOREACH_END();
 }
 
