Fix HMGET where hash fields have an integer prefix

michael-grunder · michael-grunder · commit 834d2b37f1df · 2025-10-09T11:15:27.000-07:00
We were incorrectly ignoring errors when calling `is_numeric_string`, meaning we would truncate hash fields that had integer prefixes. ```php $redis->hmget('hash', ['123notaninteger']); // Would actually execute: // HMGET hash 123 ``` Fixes #2731
diff --git a/redis_commands.c b/redis_commands.c
@@ -2688,7 +2688,7 @@ static inline zval *coerce_hash_field(zval *zv, zval *aux) {
 
     if (UNEXPECTED(Z_TYPE_P(zv) == IS_STRING &&
                    is_numeric_string(Z_STRVAL_P(zv),
-                                     Z_STRLEN_P(zv), &lv, NULL, 1) == IS_LONG))
+                                     Z_STRLEN_P(zv), &lv, NULL, 0) == IS_LONG))
     {
         ZVAL_LONG(aux, lv);
         return aux;
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -3395,6 +3395,24 @@ public function testHashes() {
 	}
     }
 
+    /* Regression test for GitHub issue 2731 */
+    public function testNumericPrefixHashFields() {
+        $hash = [
+            '86deaeb05e3f7760b67e92897a1325e0fdd8618d' => 'one',
+            '-86deaeb05e3f7760b67e92897a1325e0fdd8618d' => 'two',
+            12345 => 'a_real_number',
+            -12345 => 'a_negative_real_number',
+        ];
+
+        $this->assertIsInt($this->redis->del('hash'));
+        $this->assertTrue($this->redis->hmset('hash', $hash));
+
+        $res = $this->redis->hmget('hash', array_keys($hash));
+
+        // The keys from our local variable and res should be equal
+        $this->assertEqualsCanonicalizing(array_keys($hash), array_keys($res));
+    }
+
     public function testHRandField() {
         if (version_compare($this->version, '6.2.0') < 0)
             $this->MarkTestSkipped();

Original file line number	Diff line number	Diff line change
`@@ -2688,7 +2688,7 @@ static inline zval coerce_hash_field(zval zv, zval *aux) {`
`2688`	`2688`
`2689`	`2689`	`if (UNEXPECTED(Z_TYPE_P(zv) == IS_STRING &&`
`2690`	`2690`	`is_numeric_string(Z_STRVAL_P(zv),`
`2691`		`- Z_STRLEN_P(zv), &lv, NULL, 1) == IS_LONG))`
	`2691`	`+ Z_STRLEN_P(zv), &lv, NULL, 0) == IS_LONG))`
`2692`	`2692`	`{`
`2693`	`2693`	`ZVAL_LONG(aux, lv);`
`2694`	`2694`	`return aux;`