Fix compile errors in redis_session.c

Sean-Der · Sean-Der · commit 9cb9d075dea4 · 2015-09-08T19:13:09.000Z
diff --git a/cluster_library.c b/cluster_library.c
@@ -581,32 +581,6 @@ unsigned short cluster_hash_key_zval(zval *z_key) {
     return cluster_hash_key(kptr, klen);
 }
 
-static char **split_str_by_delim(char *str, char *delim, int *len) {
-    char **array, *tok, *tok_buf;
-    int size=16;
-
-    *len = 0;
-
-    // Initial storage
-    array = emalloc(size * sizeof(char*));
-
-    tok = php_strtok_r(str, delim, &tok_buf);
-
-    while(tok) {
-        if(size == *len) {
-            size *= 2;
-            array = erealloc(array, size * sizeof(char*));
-        }
-
-        array[*len] = tok;
-        (*len)++;
-
-        tok = php_strtok_r(NULL, delim, &tok_buf);
-    }
-
-    return array;
-}
-
 /* Execute a CLUSTER SLOTS command against the seed socket, and return the
  * reply or NULL on failure. */
 clusterReply* cluster_get_slots(RedisSock *redis_sock TSRMLS_DC)
diff --git a/cluster_library.h b/cluster_library.h
@@ -460,4 +460,4 @@ int mbulk_resp_loop_assoc(RedisSock *redis_sock, zval *z_result,
 
 #endif
 
-/* vim: set tabstop=4 softtabstops=4 noexpandtab shiftwidth=4: */
+/* vim: set tabstop=4 softtabstop=4 noexpandtab shiftwidth=4: */
diff --git a/redis.c b/redis.c
@@ -33,7 +33,7 @@
 #include "redis_cluster.h"
 #include <zend_exceptions.h>
 
-#ifdef PHP_SESSION_NEW
+#ifdef PHP_SESSION
 #include "ext/session/php_session.h"
 #endif
 
@@ -50,7 +50,7 @@
 int le_redis_sock;
 extern int le_redis_array;
 
-#ifdef PHP_SESSION_NEW
+#ifdef PHP_SESSION
 extern ps_module ps_mod_redis;
 extern ps_module ps_mod_redis_cluster;
 #endif
diff --git a/redis_array.c b/redis_array.c
@@ -1092,6 +1092,7 @@ PHP_METHOD(RedisArray, del)
 	HANDLE_MULTI_EXEC("DEL");
 
 	/* get all args in z_args */
+	z_args = (zval *) safe_emalloc(sizeof(zval), ZEND_NUM_ARGS(), 0);
 	if(zend_get_parameters_array(ht, ZEND_NUM_ARGS(), z_args) == FAILURE) {
 		efree(z_args);
 		RETURN_FALSE;
diff --git a/redis_cluster.c b/redis_cluster.c
@@ -2873,6 +2873,7 @@ PHP_METHOD(RedisCluster, rawcommand) {
     short slot;
 
     /* Sanity check on our arguments */
+	z_args = (zval *) safe_emalloc(sizeof(zval), argc, 0);
     if (argc < 2) {
         php_error_docref(NULL TSRMLS_CC, E_WARNING,
             "You must pass at least node information as well as at least a command.");
diff --git a/redis_commands.c b/redis_commands.c
@@ -1697,6 +1697,7 @@ int redis_bitop_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     smart_string cmdstr = {0};
     short kslot;
 
+	z_args = (zval *) safe_emalloc(sizeof(zval), argc, 0);
     if(zend_get_parameters_array(ht, argc, z_args) == FAILURE ||
        argc < 3 || Z_TYPE(z_args[0]) != IS_STRING)
     {
diff --git a/redis_session.c b/redis_session.c

Original file line number	Diff line number	Diff line change
`@@ -460,4 +460,4 @@ int mbulk_resp_loop_assoc(RedisSock redis_sock, zval z_result,`
`460`	`460`
`461`	`461`	`#endif`
`462`	`462`
`463`		`-/* vim: set tabstop=4 softtabstops=4 noexpandtab shiftwidth=4: */`
	`463`	`+/* vim: set tabstop=4 softtabstop=4 noexpandtab shiftwidth=4: */`
Original file line number	Diff line number	Diff line change
`@@ -1697,6 +1697,7 @@ int redis_bitop_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,`
`1697`	`1697`	`smart_string cmdstr = {0};`
`1698`	`1698`	`short kslot;`
`1699`	`1699`
	`1700`	`+ z_args = (zval *) safe_emalloc(sizeof(zval), argc, 0);`
`1700`	`1701`	`if(zend_get_parameters_array(ht, argc, z_args) == FAILURE \|\|`
`1701`	`1702`	`argc < 3 \|\| Z_TYPE(z_args[0]) != IS_STRING)`
`1702`	`1703`	`{`