Merge pull request phpredis#900 from yatsukhnenko/issue.836

yatsukhnenko · web-flow · commit 84f4f6f3745e · 2016-07-31T09:49:04.000+03:00
Partial fix for phpredis#836 + additional checking params
diff --git a/redis.c b/redis.c
@@ -1795,7 +1795,7 @@ PHP_METHOD(Redis, select) {
         RETURN_FALSE;
     }
 
-    if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {
+    if (dbNumber < 0 || redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {
         RETURN_FALSE;
     }
 
@@ -2681,7 +2681,7 @@ PHP_METHOD(Redis, slaveof)
     {
         RETURN_FALSE;
     }
-    if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {
+    if (port < 0 || redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {
         RETURN_FALSE;
     }
 
@@ -3707,13 +3707,13 @@ PHP_METHOD(Redis, rawcommand) {
     zval **z_args;
 
     /* Sanity check on arguments */
-    z_args = emalloc(argc * sizeof(zval*));
     if (argc < 1) {
         php_error_docref(NULL TSRMLS_CC, E_WARNING,
             "Must pass at least one command keyword");
-        efree(z_args);
         RETURN_FALSE;
-    } else if (zend_get_parameters_array(ht, argc, z_args) == FAILURE) {
+    }
+    z_args = emalloc(argc * sizeof(zval*));
+    if (zend_get_parameters_array(ht, argc, z_args) == FAILURE) {
         php_error_docref(NULL TSRMLS_CC, E_WARNING,
             "Internal PHP error parsing arguments");
         efree(z_args);

Original file line number	Diff line number	Diff line change
`@@ -1795,7 +1795,7 @@ PHP_METHOD(Redis, select) {`
`1795`	`1795`	`RETURN_FALSE;`
`1796`	`1796`	`}`
`1797`	`1797`
`1798`		`- if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {`
	`1798`	`+ if (dbNumber < 0 \|\| redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {`
`1799`	`1799`	`RETURN_FALSE;`
`1800`	`1800`	`}`
`1801`	`1801`
`@@ -2681,7 +2681,7 @@ PHP_METHOD(Redis, slaveof)`
`2681`	`2681`	`{`
`2682`	`2682`	`RETURN_FALSE;`
`2683`	`2683`	`}`
`2684`		`- if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {`
	`2684`	`+ if (port < 0 \|\| redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {`
`2685`	`2685`	`RETURN_FALSE;`
`2686`	`2686`	`}`
`2687`	`2687`
`@@ -3707,13 +3707,13 @@ PHP_METHOD(Redis, rawcommand) {`
`3707`	`3707`	`zval **z_args;`
`3708`	`3708`
`3709`	`3709`	`/* Sanity check on arguments */`
`3710`		`- z_args = emalloc(argc * sizeof(zval*));`
`3711`	`3710`	`if (argc < 1) {`
`3712`	`3711`	`php_error_docref(NULL TSRMLS_CC, E_WARNING,`
`3713`	`3712`	`"Must pass at least one command keyword");`
`3714`		`- efree(z_args);`
`3715`	`3713`	`RETURN_FALSE;`
`3716`		`- } else if (zend_get_parameters_array(ht, argc, z_args) == FAILURE) {`
	`3714`	`+ }`
	`3715`	`+ z_args = emalloc(argc * sizeof(zval*));`
	`3716`	`+ if (zend_get_parameters_array(ht, argc, z_args) == FAILURE) {`
`3717`	`3717`	`php_error_docref(NULL TSRMLS_CC, E_WARNING,`
`3718`	`3718`	`"Internal PHP error parsing arguments");`
`3719`	`3719`	`efree(z_args);`