Issue phpredis#1721

yatsukhnenko · michael-grunder · commit b7f9df758b30 · 2020-03-11T15:49:22.000-07:00
Sanity check for redis_sock-&gt;stream before closing.
diff --git a/library.c b/library.c
@@ -1892,8 +1892,9 @@ PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock)
                 if (redis_sock_check_liveness(redis_sock) == SUCCESS) {
                     redis_sock->status = REDIS_SOCK_STATUS_CONNECTED;
                     return SUCCESS;
+                } else if (redis_sock->stream) {
+                    php_stream_pclose(redis_sock->stream);
                 }
-                php_stream_pclose(redis_sock->stream);
                 p->nb_active--;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1892,8 +1892,9 @@ PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock)`
`1892`	`1892`	`if (redis_sock_check_liveness(redis_sock) == SUCCESS) {`
`1893`	`1893`	`redis_sock->status = REDIS_SOCK_STATUS_CONNECTED;`
`1894`	`1894`	`return SUCCESS;`
	`1895`	`+ } else if (redis_sock->stream) {`
	`1896`	`+ php_stream_pclose(redis_sock->stream);`
`1895`	`1897`	`}`
`1896`		`- php_stream_pclose(redis_sock->stream);`
`1897`	`1898`	`p->nb_active--;`
`1898`	`1899`	`}`
`1899`	`1900`