iodine 0.4.17 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5178eaf9e2ee165e6c1d0dbb166b8c07696152ec5102e897599c16e893171bfe
-  data.tar.gz: d5bfe18ca14d60aef0d2122ce32f216600b44a51d70295fa929693ac10966f04
+  metadata.gz: 985f5c140335dc38ff849e93d96d906a322a22699695908e998c07c8ee023053
+  data.tar.gz: a5b55c180aeb05a109c5f150e013b2832fd25f95f29b729488fb150f41aaa8f2
 SHA512:
-  metadata.gz: c982ce0213871aca6041636d5091d09522e6485b31b699ce80aed70ad3d9bf13daeca857d89f6f697b73b401f4bee8ca7a7c0aa5e554c13e2785ebcb21f3c198
-  data.tar.gz: 6a304583f391cbaaa41271277ab291f50c37d34984069e8531cf068d382f2490eaaab4bce488262aa78c8230e6d6cd34e9827500bd5d30bf678fd024d5d55d00
+  metadata.gz: 97061042f83574de4992bacb013083e2eb8172fa79ae9ffea146907e53dfd5240f2fa3e91a213e6d87f90601d017fc4f8d2cf0c07726eb8b35b26f7bf82a8615
+  data.tar.gz: d9ea0fc7a78a0a4d8d59e391f85a4d228ba0878030a1e97333dee70d7b02a84400f8fc40afbf0a486a71d4fceb1f906cb9a5ed8a4e8da961a3c78c50348654c2

data/CHANGELOG.md

@@ -8,9 +8,15 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ---
 
+#### Change log v.0.4.18
+
+**Fix**: (`iodine pub/bus`) fixed issue #27 (?) where the `block` used for subscriptions would be recycled by the GC and the memory address (retained by `iodine`) would point at invalid Ruby objects (at worst) or become invalid (at best). Credit to Dmitry Davydov (@haukot) for exposing this issue.
+
+**Fix**: (`facil pub/bus`) fixed issue #27 (?) where the `memcpy` was used instead of `memmove`, resulting in possibly corrupt data in cluster messaging system. Credit to Dmitry Davydov (@haukot) for exposing this issue.
+
 #### Change log v.0.4.17
 
-**Fix**: (`iodine RubyCaller`) fixed issue #26 that exposed an issue in the exception handling logic. This fix enforces exception handling whenever entering the Ruby GVL (GIL), allowing C functions to safely enter the user's Ruby code (where before C functions were assumed to be safe and user code would be executed unprotected when routed through certain functions). Credit to @haukot for exposing this issue (issue #26).
+**Fix**: (`iodine RubyCaller`) fixed issue #26 that exposed an issue in the exception handling logic. This fix enforces exception handling whenever entering the Ruby GVL (GIL), allowing C functions to safely enter the user's Ruby code (where before C functions were assumed to be safe and user code would be executed unprotected when routed through certain functions). Credit to Dmitry Davydov (@haukot) for exposing this issue (issue #26).
 
 #### Change log v.0.4.16
 

data/ext/iodine/facil.c

@@ -761,7 +761,7 @@ static void facil_cluster_on_data(intptr_t uuid, protocol_s *pr_) {
   while (1) {
     errno = 0;
     if (pr->read < 8 || pr->read < pr->msg->len) {
-      ssize_t read = sock_read(uuid, (void *)((uintptr_t)pr->msg + pr->read),
+      ssize_t read = sock_read(uuid, (void *)(((uintptr_t)pr->msg) + pr->read),
                                pr->mem_size - pr->read);
       if (read <= 0) {
         if (read < 0)
@@ -786,10 +786,13 @@ static void facil_cluster_on_data(intptr_t uuid, protocol_s *pr_) {
       }
     }
     if ((size_t)(pr->msg->len) <= pr->read) {
+      const size_t msg_len = (size_t)(pr->msg->len);
+      const size_t leftover = (size_t)(pr->read - msg_len);
       facil_cluster_handle_msg(pr->msg);
-      pr->read = pr->read - pr->msg->len;
-      if (pr->read)
-        memcpy(pr->msg, (void *)((uintptr_t)pr->msg + pr->msg->len), pr->read);
+      pr->read = leftover;
+      if (leftover) {
+        memmove(pr->msg, (void *)(((uintptr_t)pr->msg) + msg_len), pr->read);
+      }
     }
   }
 }

data/ext/iodine/iodine_pubsub.c

@@ -503,17 +503,18 @@ static VALUE iodine_subscribe(VALUE self, VALUE args) {
   Check_Type(rb_ch, T_STRING);
 
   VALUE block = rb_block_proc();
+  Registry.add(block);
 
   pubsub_engine_s *engine =
       iodine_engine_ruby2facil(rb_hash_aref(args, engine_varid));
 
-  uintptr_t subid = (uintptr_t)
-      pubsub_subscribe(.channel.name = RSTRING_PTR(rb_ch),
-                       .channel.len = RSTRING_LEN(rb_ch), .engine = engine,
-                       .use_pattern = use_pattern,
-                       .on_message = (block ? on_pubsub_notificationin : NULL),
-                       .on_unsubscribe = (block ? iodine_on_unsubscribe : NULL),
-                       .udata1 = (void *)block);
+  uintptr_t subid =
+      (uintptr_t)pubsub_subscribe(.channel.name = RSTRING_PTR(rb_ch),
+                                  .channel.len = RSTRING_LEN(rb_ch),
+                                  .engine = engine, .use_pattern = use_pattern,
+                                  .on_message = on_pubsub_notificationin,
+                                  .on_unsubscribe = iodine_on_unsubscribe,
+                                  .udata1 = (void *)block);
   if (!subid)
     return Qnil;
   return ULL2NUM(subid);

data/ext/iodine/pubsub.c

@@ -192,15 +192,18 @@ static int pubsub_cluster_publish(struct pubsub_publish_args args) {
 static void pubsub_cluster_handle_publishing(void *data, uint32_t len) {
   msg_s *msg = data;
   if (len != sizeof(*msg) + msg->pub.channel.len + msg->pub.msg.len + 2) {
-    fprintf(stderr,
-            "ERROR: (pub/sub) cluster message size error. Message ignored.\n");
+    fprintf(
+        stderr,
+        "ERROR: (pub/sub) cluster message size error. Message ignored.\n"
+        "                 expecting %zu (ch: %zu, msg: %zu), got %zu\n",
+        (size_t)(sizeof(*msg) + msg->pub.channel.len + msg->pub.msg.len + 2),
+        (size_t)msg->pub.channel.len, (size_t)msg->pub.msg.len, (size_t)len);
     return;
   }
   msg = malloc(len);
   if (!msg) {
-    fprintf(
-        stderr,
-        "ERROR: (pub/sub) cluster message allocation error.Message ignored.\n");
+    fprintf(stderr, "ERROR: (pub/sub) cluster message allocation error. "
+                    "Message ignored.\n");
     return;
   }
   memcpy(msg, data, len);

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.4.17'.freeze
+  VERSION = '0.4.18'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.4.18
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack