Partial fix for phpredis#836 + additional checking params

yatsukhnenko · yatsukhnenko · commit e212dbb1318d · 2016-07-31T09:55:02.000+03:00
Conflicts:
	redis.c
diff --git a/redis.c b/redis.c
@@ -1777,7 +1777,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;
     }
 
@@ -2656,7 +2656,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;
     }
 
@@ -3686,13 +3686,13 @@ PHP_METHOD(Redis, rawcommand) {
     zval *z_args;
 
     /* Sanity check on arguments */
-	z_args = (zval *) safe_emalloc(sizeof(zval), argc, 0);
     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 = (zval *) safe_emalloc(sizeof(zval), argc, 0);
+    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);
@@ -3950,4 +3950,4 @@ PHP_METHOD(Redis, georadiusbymember) {
     REDIS_PROCESS_CMD(georadiusbymember, redis_read_variant_reply);
 }
 
-/* vim: set tabstop=4 softtabstop=4 noexpandtab shiftwidth=4: */
+/* vim: set tabstop=4 softtabstop=4 expandtab shiftwidth=4: */

Original file line number	Diff line number	Diff line change
`@@ -1777,7 +1777,7 @@ PHP_METHOD(Redis, select) {`
`1777`	`1777`	`RETURN_FALSE;`
`1778`	`1778`	`}`
`1779`	`1779`
`1780`		`- if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {`
	`1780`	`+ if (dbNumber < 0 \|\| redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {`
`1781`	`1781`	`RETURN_FALSE;`
`1782`	`1782`	`}`
`1783`	`1783`
`@@ -2656,7 +2656,7 @@ PHP_METHOD(Redis, slaveof)`
`2656`	`2656`	`{`
`2657`	`2657`	`RETURN_FALSE;`
`2658`	`2658`	`}`
`2659`		`- if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {`
	`2659`	`+ if (port < 0 \|\| redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {`
`2660`	`2660`	`RETURN_FALSE;`
`2661`	`2661`	`}`
`2662`	`2662`
`@@ -3686,13 +3686,13 @@ PHP_METHOD(Redis, rawcommand) {`
`3686`	`3686`	`zval *z_args;`
`3687`	`3687`
`3688`	`3688`	`/* Sanity check on arguments */`
`3689`		`- z_args = (zval *) safe_emalloc(sizeof(zval), argc, 0);`
`3690`	`3689`	`if (argc < 1) {`
`3691`	`3690`	`php_error_docref(NULL TSRMLS_CC, E_WARNING,`
`3692`	`3691`	`"Must pass at least one command keyword");`
`3693`		`- efree(z_args);`
`3694`	`3692`	`RETURN_FALSE;`
`3695`		`- } else if (zend_get_parameters_array(ht, argc, z_args) == FAILURE) {`
	`3693`	`+ }`
	`3694`	`+ z_args = (zval *) safe_emalloc(sizeof(zval), argc, 0);`
	`3695`	`+ if (zend_get_parameters_array(ht, argc, z_args) == FAILURE) {`
`3696`	`3696`	`php_error_docref(NULL TSRMLS_CC, E_WARNING,`
`3697`	`3697`	`"Internal PHP error parsing arguments");`
`3698`	`3698`	`efree(z_args);`
`@@ -3950,4 +3950,4 @@ PHP_METHOD(Redis, georadiusbymember) {`
`3950`	`3950`	`REDIS_PROCESS_CMD(georadiusbymember, redis_read_variant_reply);`
`3951`	`3951`	`}`
`3952`	`3952`
`3953`		`-/* vim: set tabstop=4 softtabstop=4 noexpandtab shiftwidth=4: */`
	`3953`	`+/* vim: set tabstop=4 softtabstop=4 expandtab shiftwidth=4: */`