Merge pull request phpredis#741 from KartinaTV/develop

michael-grunder · michael-grunder · commit fcf52b82ddf1 · 2016-02-13T12:05:19.000-08:00
Fix problem with rediscluster storage
diff --git a/redis_session.c b/redis_session.c
@@ -627,7 +627,7 @@ PS_READ_FUNC(rediscluster) {
 
     /* Attempt to read reply */
     reply = cluster_read_resp(c TSRMLS_CC);
-    if (!reply || c->err) {
+    if (!reply || c->err || reply->str == NULL) {
         if (reply) cluster_free_reply(reply, 1);
         return FAILURE;
     }

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,7 @@ PS_READ_FUNC(rediscluster) {`
`627`	`627`
`628`	`628`	`/* Attempt to read reply */`
`629`	`629`	`reply = cluster_read_resp(c TSRMLS_CC);`
`630`		`- if (!reply \|\| c->err) {`
	`630`	`+ if (!reply \|\| c->err \|\| reply->str == NULL) {`
`631`	`631`	`if (reply) cluster_free_reply(reply, 1);`
`632`	`632`	`return FAILURE;`
`633`	`633`	`}`