Fix #1956 bad type usage on 32-bit

remicollet · michael-grunder · commit 672dec87fd4d · 2021-10-05T14:32:16.000-07:00
diff --git a/library.c b/library.c
@@ -2905,7 +2905,7 @@ redis_unpack(RedisSock *redis_sock, const char *val, int val_len, zval *z_ret)
 #ifdef HAVE_REDIS_ZSTD
             {
                 char *data;
-                size_t len;
+                unsigned long long len;
 
                 len = ZSTD_getFrameContentSize(val, val_len);
 
diff --git a/redis_array.c b/redis_array.c
@@ -226,7 +226,7 @@ PHP_METHOD(RedisArray, __construct)
     RedisArray *ra = NULL;
     zend_bool b_index = 0, b_autorehash = 0, b_pconnect = 0, consistent = 0;
     HashTable *hPrev = NULL, *hOpts = NULL;
-    long l_retry_interval = 0;
+    zend_long l_retry_interval = 0;
       zend_bool b_lazy_connect = 0;
     double d_connect_timeout = 0, read_timeout = 0.0;
     zend_string *algorithm = NULL, *user = NULL, *pass = NULL;
@@ -278,7 +278,7 @@ PHP_METHOD(RedisArray, __construct)
     }
 
     ra = ra_make_array(Z_ARRVAL_P(z0), &z_fun, &z_dist, hPrev, b_index,
-                       b_pconnect, l_retry_interval, b_lazy_connect,
+                       b_pconnect, (long)l_retry_interval, b_lazy_connect,
                        d_connect_timeout, read_timeout, consistent,
                        algorithm, user, pass);
 
diff --git a/redis_array_impl.c b/redis_array_impl.c
@@ -158,7 +158,7 @@ RedisArray *ra_load_array(const char *name) {
 
     zend_string *algorithm = NULL, *user = NULL, *pass = NULL;
     zend_bool b_index = 0, b_autorehash = 0, b_pconnect = 0, consistent = 0;
-    long l_retry_interval = 0;
+    zend_long l_retry_interval = 0;
     zend_bool b_lazy_connect = 0;
     double d_connect_timeout = 0, read_timeout = 0.0;
     HashTable *hHosts = NULL, *hPrev = NULL;
@@ -291,7 +291,7 @@ RedisArray *ra_load_array(const char *name) {
     }
 
     /* create RedisArray object */
-    ra = ra_make_array(hHosts, &z_fun, &z_dist, hPrev, b_index, b_pconnect, l_retry_interval,
+    ra = ra_make_array(hHosts, &z_fun, &z_dist, hPrev, b_index, b_pconnect, (long)l_retry_interval,
                        b_lazy_connect, d_connect_timeout, read_timeout, consistent, algorithm,
                        user, pass);
     if (ra) {

Original file line number	Diff line number	Diff line change
`@@ -2905,7 +2905,7 @@ redis_unpack(RedisSock redis_sock, const char val, int val_len, zval *z_ret)`
`2905`	`2905`	`#ifdef HAVE_REDIS_ZSTD`
`2906`	`2906`	`{`
`2907`	`2907`	`char *data;`
`2908`		`- size_t len;`
	`2908`	`+ unsigned long long len;`
`2909`	`2909`
`2910`	`2910`	`len = ZSTD_getFrameContentSize(val, val_len);`
`2911`	`2911`