Allow for string based longs in zrangebyscore

michael-grunder · michael-grunder · commit d9bd4e9ef646 · 2016-07-29T09:38:53.000-07:00
This works differently than the non-php7 version, as the zend library has now added explicit methods for conversions such as this, which handle more types (e.g. FALSE/NULL will equate to zero, and TRUE will equate to 1). However a non numeric string such as "not a number" will also equate to zero, but this seems to be the way it's intended to work. Fixes phpredis#906
diff --git a/redis_commands.c b/redis_commands.c
@@ -537,12 +537,11 @@ int redis_zrangebyscore_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
             HashTable *ht_limit = Z_ARRVAL_P(z_ele);
             zval *z_off, *z_cnt;
             if((z_off = zend_hash_index_find(ht_limit,0)) != NULL &&
-               (z_cnt = zend_hash_index_find(ht_limit,1)) != NULL &&
-               Z_TYPE_P(z_off) == IS_LONG && Z_TYPE_P(z_cnt) == IS_LONG)
+               (z_cnt = zend_hash_index_find(ht_limit,1)) != NULL)
             {
                 has_limit  = 1;
-                limit_low  = Z_LVAL_P(z_off);
-                limit_high = Z_LVAL_P(z_cnt);
+                limit_low  = zval_get_long(z_off);
+                limit_high = zval_get_long(z_cnt);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -537,12 +537,11 @@ int redis_zrangebyscore_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,`
`537`	`537`	`HashTable *ht_limit = Z_ARRVAL_P(z_ele);`
`538`	`538`	`zval z_off, z_cnt;`
`539`	`539`	`if((z_off = zend_hash_index_find(ht_limit,0)) != NULL &&`
`540`		`- (z_cnt = zend_hash_index_find(ht_limit,1)) != NULL &&`
`541`		`- Z_TYPE_P(z_off) == IS_LONG && Z_TYPE_P(z_cnt) == IS_LONG)`
	`540`	`+ (z_cnt = zend_hash_index_find(ht_limit,1)) != NULL)`
`542`	`541`	`{`
`543`	`542`	`has_limit = 1;`
`544`		`- limit_low = Z_LVAL_P(z_off);`
`545`		`- limit_high = Z_LVAL_P(z_cnt);`
	`543`	`+ limit_low = zval_get_long(z_off);`
	`544`	`+ limit_high = zval_get_long(z_cnt);`
`546`	`545`	`}`
`547`	`546`	`}`
`548`	`547`	`}`