hiredis-client 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aa2f8ffa2883aebac37552a2e128a13bf36e79aa9da6ba9be3cc00369230583
-  data.tar.gz: d786c010f218c5866db63a5e176438d3aee9d7539d443db034aa2b2f788f67f4
+  metadata.gz: 6fca3cf8fc6ec3d278b045025946060403d0ab94f8222a114364afad034ca94b
+  data.tar.gz: aa46473c0bbe84c4b279cb9bbab14246b39a74578d55932b602ccca15c79eb51
 SHA512:
-  metadata.gz: 230789e6acf2e3bd62c0050b1d13f58546811be59364cb7fe0281d5f7c05970f111eae67665361f23a403ba60931aad33bda5ddaaaca823a02724b13cca0adbb
-  data.tar.gz: 5e336e18352fc4698794f7885576256027f6d3deb45df3a88fe3533359a7fc6a0ad66fa7616c617ee462831f0f6696e018df9b477f49beca0574734be13adb4a
+  metadata.gz: 9944f993c9c111c504a66e5a2a976e3480ed10943732410bf68e6142a0c0b0c01c545133f4e021e08c0c8205113b41170bd1ee3da937ae198ef0c9ab768c6a1b
+  data.tar.gz: efa20c614f0224f8ea72fbe5bee26a9a260a12b8ee0b4dac4f9a0bd6a2c1e9146e0dbb273419f24c1abc2cf141d0d8272d021e64d55a62db21ac5b7068b45b26

data/ext/redis_client/hiredis/hiredis_connection.c

@@ -155,6 +155,7 @@ static void *reply_append(const redisReadTask *task, VALUE value) {
                 if (task->idx % 2) {
                     VALUE key = rb_ary_pop(state->stack);
                     rb_hash_aset(parent, key, value);
+                    RB_GC_GUARD(key);
                 } else {
                     rb_ary_push(state->stack, value);
                 }
@@ -163,8 +164,10 @@ static void *reply_append(const redisReadTask *task, VALUE value) {
                 rb_bug("[hiredis] Unexpected task parent type %d", task->parent->type);
                 break;
         }
+        RB_GC_GUARD(parent);
     }
     rb_ary_store(state->stack, task_index, value);
+    RB_GC_GUARD(value);
     return (void*)value;
 }
 
@@ -464,6 +467,19 @@ static int hiredis_wait_readable(int fd, const struct timeval *timeout, int *iss
     return 0;
 }
 
+struct fd_select {
+    rb_fdset_t *write_fds;
+    struct timeval *timeout;
+    int max;
+    int return_value;
+};
+
+static VALUE protected_writable_select(VALUE _args) {
+    struct fd_select *args = (struct fd_select *)_args;
+    args->return_value = rb_thread_fd_select(args->max, NULL, args->write_fds, NULL, args->timeout);
+    return Qnil;
+}
+
 static int hiredis_wait_writable(int fd, const struct timeval *timeout, int *isset) {
     struct timeval to;
     struct timeval *toptr = NULL;
@@ -480,7 +496,18 @@ static int hiredis_wait_writable(int fd, const struct timeval *timeout, int *iss
         toptr = &to;
     }
 
-    if (rb_thread_fd_select(fd + 1, NULL, &fds, NULL, toptr) < 0) {
+    struct fd_select args = {
+        .max = fd + 1,
+        .write_fds = &fds,
+        .timeout = toptr,
+    };
+    int status;
+
+    (void)rb_protect(protected_writable_select, (VALUE)&args, &status);
+
+    // Error in case an exception arrives in rb_thread_fd_select()
+    // (e.g. from Thread.raise)
+    if (status || args.return_value < 0) {
         rb_fd_term(&fds);
         return -1;
     }
@@ -498,7 +525,6 @@ static VALUE hiredis_connect_finish(hiredis_connection_t *connection, redisConte
         redisFree(context);
         rb_raise(rb_eRuntimeError, "HiredisConnection is already connected, must be a bug");
     }
-    connection->context = context;
 
     if (context->err) {
         redis_raise_error_and_disconnect(context, rb_eRedisClientCannotConnectError);
@@ -533,6 +559,7 @@ static VALUE hiredis_connect_finish(hiredis_connection_t *connection, redisConte
 
     context->reader->fn = &reply_functions;
     redisSetPushCallback(context, NULL);
+    connection->context = context;
     return Qtrue;
 }
 
@@ -598,9 +625,14 @@ static VALUE hiredis_reconnect(VALUE self, VALUE is_unix, VALUE ssl_param) {
         return Qfalse;
     }
 
-    hiredis_reconnect_nogvl(connection->context);
+    // Clear context on the connection, since the nogvl call can raise an
+    // exception after the redisReconnect() call succeeds and leave the
+    // connection in a half-initialized state.
+    redisContext *context = connection->context;
+    connection->context = NULL;
+    hiredis_reconnect_nogvl(context);
 
-    VALUE success = hiredis_connect_finish(connection, connection->context);
+    VALUE success = hiredis_connect_finish(connection, context);
 
     if (RTEST(success)) {
         if (!RTEST(is_unix)) {
@@ -693,8 +725,9 @@ static int hiredis_read_internal(hiredis_connection_t *connection, VALUE *reply)
     // We use that to avoid having to have a `mark` function with write barriers.
     // Not that it would be too hard, but if we mark the response objects, we'll likely end up
     // promoting them to the old generation which isn't desirable.
+    VALUE stack = rb_ary_new();
     hiredis_reader_state_t reader_state = {
-        .stack = rb_ary_new(),
+        .stack = stack,
         .task_index = &connection->context->reader->ridx,
     };
     connection->context->reader->privdata = &reader_state;
@@ -759,10 +792,10 @@ static int hiredis_read_internal(hiredis_connection_t *connection, VALUE *reply)
 
     /* Set reply object */
     if (reply != NULL) {
-        *reply = (VALUE)redis_reply;
+        *reply = rb_ary_entry(stack, 0);
     }
 
-    RB_GC_GUARD(reader_state.stack);
+    RB_GC_GUARD(stack);
 
     return 0;
 }
@@ -789,6 +822,7 @@ static VALUE hiredis_read(VALUE self) {
         // See reply_create_bool
         reply = Qfalse;
     }
+    RB_GC_GUARD(self);
     return reply;
 }
 
@@ -806,7 +840,7 @@ static inline double diff_timespec_ms(const struct timespec *time1, const struct
 }
 
 static inline int timeval_to_msec(struct timeval duration) {
-    return duration.tv_sec * 1000 + duration.tv_usec / 1000;
+    return (int)(duration.tv_sec * 1000 + duration.tv_usec / 1000);
 }
 
 typedef struct {
@@ -895,8 +929,8 @@ RUBY_FUNC_EXPORTED void Init_hiredis_connection(void) {
     redisInitOpenSSL();
 
     id_parse = rb_intern("parse");
-    Redis_Qfalse = rb_obj_alloc(rb_cObject);
     rb_global_variable(&Redis_Qfalse);
+    Redis_Qfalse = rb_obj_alloc(rb_cObject);
 
     VALUE rb_cRedisClient = rb_const_get(rb_cObject, rb_intern("RedisClient"));
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiredis-client
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
 description:
 email:
 - jean.boussier@gmail.com