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

Merge pull request #1882 from phpredis/issue.1873

Browse Source 
Issue #1873
This commit is contained in:
Pavlo Yatsukhnenko
2020-11-19 08:23:04 +02:00
committed by GitHub
parent 9f2972b54e 3a09f69b09
commit 32564e5b46
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
redis_commands.c
+20 -8
View File
@@ -2669,16 +2669,28 @@ int redis_zadd_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
// Now the rest of our arguments
while (i < num) {
// Append score and member
if (Z_TYPE(z_args[i]) == IS_STRING && (
/* The score values should be the string representation of a double
switch (Z_TYPE(z_args[i])) {
case IS_LONG:
case IS_DOUBLE:
redis_cmd_append_sstr_dbl(&cmdstr, zval_get_double(&z_args[i]));
break;
case IS_STRING:
/* The score values must be the string representation of a double
* precision floating point number. +inf and -inf values are valid
* values as well. */
strncasecmp(Z_STRVAL(z_args[i]), "-inf", 4) == 0 ||
strncasecmp(Z_STRVAL(z_args[i]), "+inf", 4) == 0
)) {
redis_cmd_append_sstr(&cmdstr, Z_STRVAL(z_args[i]), Z_STRLEN(z_args[i]));
} else {
redis_cmd_append_sstr_dbl(&cmdstr, zval_get_double(&z_args[i]));
if (strncasecmp(Z_STRVAL(z_args[i]), "-inf", 4) == 0 ||
strncasecmp(Z_STRVAL(z_args[i]), "+inf", 4) == 0 ||
is_numeric_string(Z_STRVAL(z_args[i]), Z_STRLEN(z_args[i]), NULL, NULL, 0) != 0
) {
redis_cmd_append_sstr(&cmdstr, Z_STRVAL(z_args[i]), Z_STRLEN(z_args[i]));
break;
}
// fall through
default:
php_error_docref(NULL, E_WARNING, "Scores must be numeric or '-inf','+inf'");
smart_string_free(&cmdstr);
efree(z_args);
return FAILURE;
}
// serialize value if requested
val_free = redis_pack(redis_sock, &z_args[i+1], &val, &val_len);