Consolidate failure path

michael-grunder · michael-grunder · commit 3d7be35816cd · 2024-04-09T12:58:45.000-07:00
diff --git a/redis_session.c b/redis_session.c
@@ -108,6 +108,10 @@ PHP_REDIS_API void
 redis_pool_free(redis_pool *pool) {
 
     redis_pool_member *rpm, *next;
+
+    if (pool == NULL)
+        return;
+
     rpm = pool->head;
     while (rpm) {
         next = rpm->next;
@@ -460,9 +464,7 @@ PS_OPEN_FUNC(redis)
                     "Failed to parse session.save_path (error at offset %d, url was '%s')", i, path);
                 efree(path);
 
-                redis_pool_free(pool);
-                PS_SET_MOD_DATA(NULL);
-                return FAILURE;
+                goto fail;
             }
 
             ZVAL_NULL(&context);
@@ -509,10 +511,8 @@ PS_OPEN_FUNC(redis)
                 if (prefix) zend_string_release(prefix);
                 if (user) zend_string_release(user);
                 if (pass) zend_string_release(pass);
-                redis_pool_free(pool);
-                PS_SET_MOD_DATA(NULL);
 
-                return FAILURE;
+                goto fail;
             }
 
             RedisSock *redis_sock;
@@ -563,7 +563,9 @@ PS_OPEN_FUNC(redis)
         return SUCCESS;
     }
 
+fail:
     redis_pool_free(pool);
+    PS_SET_MOD_DATA(NULL);
     return FAILURE;
 }
 /* }}} */
