Added extra check on free.

nicolasff · nicolasff · commit 18a2d36b3271 · 2010-12-03T09:44:52.000+01:00
diff --git a/library.c b/library.c
@@ -793,7 +793,9 @@ PHPAPI int redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRML
  */
 PHPAPI int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC)
 {
-    int res = 0;
+    if (redis_sock == NULL) {
+	    return 1;
+    }
 
     if (redis_sock->stream != NULL) {
         redis_sock_write(redis_sock, "QUIT", sizeof("QUIT") - 1 TSRMLS_CC);
@@ -804,10 +806,10 @@ PHPAPI int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC)
 	}
         redis_sock->stream = NULL;
 
-        res = 1;
+        return 1;
     }
 
-    return res;
+    return 0;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,9 @@ PHPAPI int redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRML`
`793`	`793`	`*/`
`794`	`794`	`PHPAPI int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC)`
`795`	`795`	`{`
`796`		`- int res = 0;`
	`796`	`+ if (redis_sock == NULL) {`
	`797`	`+ return 1;`
	`798`	`+ }`
`797`	`799`
`798`	`800`	`if (redis_sock->stream != NULL) {`
`799`	`801`	`redis_sock_write(redis_sock, "QUIT", sizeof("QUIT") - 1 TSRMLS_CC);`
`@@ -804,10 +806,10 @@ PHPAPI int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC)`
`804`	`806`	`}`
`805`	`807`	`redis_sock->stream = NULL;`
`806`	`808`
`807`		`- res = 1;`
	`809`	`+ return 1;`
`808`	`810`	`}`
`809`	`811`
`810`		`- return res;`
	`812`	`+ return 0;`
`811`	`813`	`}`
`812`	`814`
`813`	`815`	`/**`