Allow calling methods only in atomic mode

yatsukhnenko · michael-grunder · commit cbaf095ff708 · 2025-03-20T10:38:56.000-07:00
diff --git a/library.c b/library.c
@@ -2077,16 +2077,15 @@ redis_hello_response(INTERNAL_FUNCTION_PARAMETERS,
     zv = zend_hash_str_find(Z_ARRVAL(z_ret), ZEND_STRL("version"));
     redis_sock->hello.version = zv ? zval_get_string(zv) : ZSTR_EMPTY_ALLOC();
 
-    if (ctx != NULL) {
-        zval_dtor(&z_ret);
-        if (ctx == PHPREDIS_CTX_PTR) {
-            ZVAL_STR_COPY(&z_ret, redis_sock->hello.server);
-        } else if (ctx == PHPREDIS_CTX_PTR + 1) {
-            ZVAL_STR_COPY(&z_ret, redis_sock->hello.version);
-        } else {
-            ZEND_ASSERT(!"memory corruption?");
-            return FAILURE;
-        }
+    zval_dtor(&z_ret);
+
+    if (ctx == PHPREDIS_CTX_PTR) {
+        ZVAL_STR_COPY(&z_ret, redis_sock->hello.server);
+    } else if (ctx == PHPREDIS_CTX_PTR + 1) {
+        ZVAL_STR_COPY(&z_ret, redis_sock->hello.version);
+    } else {
+        ZEND_ASSERT(!"memory corruption?");
+        return FAILURE;
     }
 
     if (IS_ATOMIC(redis_sock)) {
diff --git a/redis.c b/redis.c
@@ -2580,7 +2580,11 @@ PHP_METHOD(Redis, getPort) {
 PHP_METHOD(Redis, serverName) {
     RedisSock *rs;
 
-    if ((rs = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU)) == NULL) {
+    if ((rs = redis_sock_get_instance(getThis(), 1)) == NULL) {
+        RETURN_FALSE;
+    } else if (!IS_ATOMIC(rs)) {
+        php_error_docref(NULL, E_ERROR,
+            "Can't call serverName in multi or pipeline mode!");
         RETURN_FALSE;
     } else if (rs->hello.server != NULL) {
         RETURN_STR_COPY(rs->hello.server);
@@ -2592,7 +2596,11 @@ PHP_METHOD(Redis, serverName) {
 PHP_METHOD(Redis, serverVersion) {
     RedisSock *rs;
 
-    if ((rs = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU)) == NULL) {
+    if ((rs = redis_sock_get_instance(getThis(), 1)) == NULL) {
+        RETURN_FALSE;
+    } else if (!IS_ATOMIC(rs)) {
+        php_error_docref(NULL, E_ERROR,
+            "Can't call serverVersion in multi or pipeline mode!");
         RETURN_FALSE;
     } else if (rs->hello.version != NULL) {
         RETURN_STR_COPY(rs->hello.version);
diff --git a/redis.stub.php b/redis.stub.php
@@ -1595,14 +1595,14 @@ public function getPort(): int;
      *
      * @return string|false
      */
-    public function serverName(): Redis|string|false;
+    public function serverName(): string|false;
 
     /**
      * Get the server version as reported by the `HELLO` response.
      *
      * @return string|false
      */
-    public function serverVersion(): Redis|string|false;
+    public function serverVersion(): string|false;
 
     /**
      * Retrieve a substring of a string by index.
diff --git a/redis_arginfo.h b/redis_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 79376d7ada29d6f9bb873e7c59e64e22af3ca559 */
+ * Stub hash: 805a66c17b7c9972c73a979bdd67f98f7c1f6c74 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
@@ -363,7 +363,7 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_Redis_getPort arginfo_class_Redis_getDBNum
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_serverName, 0, 0, Redis, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_Redis_serverName, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Redis_serverVersion arginfo_class_Redis_serverName
@@ -686,7 +686,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_rPop, 0, 1, Redi
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, count, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Redis_randomKey arginfo_class_Redis_serverName
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_randomKey, 0, 0, Redis, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_rawcommand, 0, 1, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO(0, command, IS_STRING, 0)
diff --git a/redis_legacy_arginfo.h b/redis_legacy_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 79376d7ada29d6f9bb873e7c59e64e22af3ca559 */
+ * Stub hash: 805a66c17b7c9972c73a979bdd67f98f7c1f6c74 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, options)
