Add back a default switch case for setoption handler

michael-grunder · michael-grunder · commit 8746493296b5 · 2022-10-01T10:03:48.000-07:00
We can't use `EMPTY_SWITCH_DEFAULT_CASE` here as the underlying macro
will actually panic, as it calls `ZEND_UNREACHABLE` under the hood.
diff --git a/redis_commands.c b/redis_commands.c
@@ -5566,7 +5566,9 @@ void redis_setoption_handler(INTERNAL_FUNCTION_PARAMETERS,
                 RETURN_TRUE;
             }
             break;
-        EMPTY_SWITCH_DEFAULT_CASE()
+        default:
+            php_error_docref(NULL, E_WARNING, "Unknown option '" ZEND_LONG_FMT "'", option);
+            break;
     }
     RETURN_FALSE;
 }
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -6985,6 +6985,11 @@ public function testCopy()
         $this->assertEquals('bar', $this->redis->get('key2'));
     }
 
+    /* Make sure we handle a bad option value gracefully */
+    public function testBadOptionValue() {
+        $this->assertFalse(@$this->redis->setOption(pow(2, 32), false));
+    }
+
     public  function testSession_regenerateSessionId_noLock_noDestroy() {
         $this->setSessionHandler();
         $sessionId = $this->generateSessionId();

Original file line number	Diff line number	Diff line change
`@@ -5566,7 +5566,9 @@ void redis_setoption_handler(INTERNAL_FUNCTION_PARAMETERS,`
`5566`	`5566`	`RETURN_TRUE;`
`5567`	`5567`	`}`
`5568`	`5568`	`break;`
`5569`		`- EMPTY_SWITCH_DEFAULT_CASE()`
	`5569`	`+ default:`
	`5570`	`+ php_error_docref(NULL, E_WARNING, "Unknown option '" ZEND_LONG_FMT "'", option);`
	`5571`	`+ break;`
`5570`	`5572`	`}`
`5571`	`5573`	`RETURN_FALSE;`
`5572`	`5574`	`}`