mirror/phpredis
1
0
Fork 0
mirror of https://github.com/phpredis/phpredis.git synced 2026-06-19 07:35:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check number of elements in incoming array-argument

Browse Source
This commit is contained in:
Pavlo Yatsukhnenko
2017-08-28 16:14:42 +03:00
parent e5660be4c6
commit 4a0a46b4cb
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
redis_array.c
+14 -4
View File
@@ -394,7 +394,9 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
zend_bool b_write_cmd = 0;
h_args = Z_ARRVAL_P(z_args);
argc = zend_hash_num_elements(h_args);
if ((argc = zend_hash_num_elements(h_args)) == 0) {
RETURN_FALSE;
}
if(ra->z_multi_exec) {
redis_inst = ra->z_multi_exec; /* we already have the instance */
@@ -935,7 +937,9 @@ PHP_METHOD(RedisArray, mget)
/* init data structures */
h_keys = Z_ARRVAL_P(z_keys);
argc = zend_hash_num_elements(h_keys);
if ((argc = zend_hash_num_elements(h_keys)) == 0) {
RETURN_FALSE;
}
argv = emalloc(argc * sizeof(zval*));
pos = emalloc(argc * sizeof(int));
@@ -1087,7 +1091,9 @@ PHP_METHOD(RedisArray, mset)
/* init data structures */
h_keys = Z_ARRVAL_P(z_keys);
argc = zend_hash_num_elements(h_keys);
if ((argc = zend_hash_num_elements(h_keys)) == 0) {
RETURN_FALSE;
}
argv = emalloc(argc * sizeof(zval*));
pos = emalloc(argc * sizeof(int));
keys = emalloc(argc * sizeof(char*));
@@ -1234,7 +1240,11 @@ PHP_METHOD(RedisArray, del)
/* init data structures */
h_keys = Z_ARRVAL(z_keys);
argc = zend_hash_num_elements(h_keys);
if ((argc = zend_hash_num_elements(h_keys)) == 0) {
if (free_zkeys) zval_dtor(&z_keys);
efree(z_args);
RETURN_FALSE;
}
argv = emalloc(argc * sizeof(zval*));
pos = emalloc(argc * sizeof(int));
redis_array_impl.c
+1 -2
View File
@@ -344,8 +344,7 @@ ra_make_array(HashTable *hosts, zval *z_fun, zval *z_dist, HashTable *hosts_prev
int i, count;
RedisArray *ra;
if (!hosts) return NULL;
count = zend_hash_num_elements(hosts);
if (!hosts || (count = zend_hash_num_elements(hosts)) == 0) return NULL;
/* create object */
ra = emalloc(sizeof(RedisArray));