rbczmq 1.7.0 → 1.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTIyYzk0ZmFkOTc4Y2YwMmRlYzc3ZGE0NmQyZTBhOGRlODQyMDcxMA==
+    MTYzNjRlZGJiYTMyN2NhZDQ4OTM4MmRjMzEzODM4NjIzYzA2NTE2Mw==
   data.tar.gz: !binary |-
-    NTI4NzQyMDhkNGRjNGE5NDgxMDE3ZDg5MjU2YTViZWZiMWNjYzQxZA==
+    YTNmNWY3NzBhMDRlOWI4MGFkNjc5NTVlZDFkY2RhMjRhMTZhM2QyMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmQ5NzExNWFhM2ZiODBlZmY4ZDZkMmM5YjBjMDQxODNkZDFlNTUxZmZlMjIz
-    N2JkZGU0Mjg4NzJlZTM2ZTEzYjI5ZDdkMGExNDU5MGMzMDE1ZjM2OTUxOTk4
-    ZDAyYjcwNTcyOGUzYjNhOTFkYzYyZTM5NTBkNjgyNDgyN2Q0ZDg=
+    MjRiOTYyZTlmNjY0NzVlYjdmYzNiZjZjZWVmMWZiYmUyYmJlZmNhZTYwYjky
+    MjM0OTFmMzAxMjA4ZDBkMDM5ZGUyYTg3ZjYwYTk2OTIzOTAxMzA2MjI3NWJm
+    YjAxNGJiN2M0MDAzNzQyYTMyMWFmY2MxYzQ1MDRmODI4OTI3Njg=
   data.tar.gz: !binary |-
-    NDJmOGNmNmMwNGM3YjY5NmUwYTZmOTYzNzAyNGU5YzFmMTc0NGRhYTUzYjIw
-    YzI0YjJiODBlMjliMGQyYThjNjFhMWE1MWExZTJhNjAzNTMyNjQzZTM2YWZk
-    M2NiYzc5Mzc0NGE0NjlkMmQ1YzBmYTMyYjdiZjkxNmFkMGE5ZTI=
+    NWFjYzEyNDU2OTBmMjM2NjFmY2Y1MzY3MjhhNjIzMTdiMDkwZTgzYjYyNjlj
+    OGRmNzEyY2QyMzczMDhhZWIyY2I0NmViNGNjOTY0MjYwM2UwYTA0ZjMxOTI4
+    NWI2YmJjNjFmNWI5NTQwOWU3Mzc0NmVjYTkyZTEzZGM2MDlkNWM=

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 = Changelog
 
+== 1.7.1 (July 25, 2013)
+
+* FIX: ZMQ::Message#pop did not relase ownership of frame.
+* FIX: !Important! ZMQ::Message was not marking owned ZMQ::Frame objects, leading to potential GC crash in 1.7.0.
+* FIX: Fixed memory leak in ZMQ::Message.
+* Updated license in gemspec and readme.
+
 == 1.7.0 (July 21, 2013)
 
 * ZMQ::Frame - Implemented an interal wrapper around the underlying czmq frame objects to better manage memory and object ownership. (Matt Connolly)

data/README.rdoc

@@ -232,6 +232,11 @@ You can get those with brew packaging system:
 
     brew install libtool autoconf automake
 
+== LICENSE
+
+The rbczmq gem is licensed under the MIT license. See the file "MIT-LICENSE" for details.
+This gem uses the "zmq" and "czmq" libraries, both of which are licensed under the LGPL license.
+
 == TODO
 
 * ZMQ::Message#save && ZMQ::Message.load

data/ext/rbczmq/frame.c

@@ -28,10 +28,11 @@ VALUE rb_czmq_alloc_frame(zframe_t *frame)
 */
 void rb_czmq_free_frame(zmq_frame_wrapper *frame)
 {
-    if (frame && frame->frame && (frame->flags & ZMQ_FRAME_OWNED) != 0) {
+    if (frame->frame && (frame->flags & ZMQ_FRAME_OWNED) != 0) {
         zframe_destroy(&frame->frame);
         frame->flags &= ~ZMQ_FRAME_OWNED;
     }
+    frame->frame = NULL;
 }
 
 /*
@@ -42,7 +43,10 @@ void rb_czmq_free_frame(zmq_frame_wrapper *frame)
 void rb_czmq_free_frame_gc(void *ptr)
 {
     zmq_frame_wrapper *frame = (zmq_frame_wrapper *)ptr;
-    rb_czmq_free_frame(frame);
+    if (frame) {
+        rb_czmq_free_frame(frame);
+        xfree(frame);
+    }
 }
 
 /*

data/ext/rbczmq/message.c

@@ -8,10 +8,14 @@
 void rb_czmq_free_message(zmq_message_wrapper *message)
 {
     errno = 0;
-    if (message != NULL && message->message != NULL && message->flags & ZMQ_MESSAGE_OWNED) {
+
+    if (message->message != NULL && message->flags & ZMQ_MESSAGE_OWNED) {
         zmsg_destroy(&message->message);
-        message->message = NULL;
         message->flags &= ~ZMQ_MESSAGE_OWNED;
+    }
+    message->message = NULL;
+
+    if (message->frames) {
         zlist_destroy(&message->frames);
     }
 }
@@ -36,10 +40,12 @@ static void rb_czmq_free_message_gc(void *ptr)
 */
 void rb_czmq_mark_message(zmq_message_wrapper *message)
 {
-    VALUE frame = (VALUE)zlist_first(message->frames);
-    while (frame) {
-        rb_gc_mark(frame);
-        frame = (VALUE)zlist_next(message->frames);
+    if (message->frames) {
+        VALUE frame = (VALUE)zlist_first(message->frames);
+        while (frame) {
+            rb_gc_mark(frame);
+            frame = (VALUE)zlist_next(message->frames);
+        }
     }
 }
 
@@ -53,7 +59,7 @@ VALUE rb_czmq_alloc_message(zmsg_t *message)
     VALUE message_obj;
     zmq_message_wrapper *m = NULL;
     errno = 0;
-    message_obj = Data_Make_Struct(rb_cZmqMessage, zmq_message_wrapper, 0, rb_czmq_free_message_gc, m);
+    message_obj = Data_Make_Struct(rb_cZmqMessage, zmq_message_wrapper, rb_czmq_mark_message, rb_czmq_free_message_gc, m);
     m->message = message;
     ZmqAssertObjOnAlloc(m->message, m);
     m->flags = ZMQ_MESSAGE_OWNED;
@@ -217,12 +223,16 @@ static VALUE rb_czmq_message_add(VALUE obj, VALUE frame_obj)
 
 static VALUE rb_czmq_message_pop(VALUE obj)
 {
-    zframe_t *frame = NULL;
+    zframe_t *zframe = NULL;
     ZmqGetMessage(obj);
     ZmqAssertMessageOwned(message);
-    frame = zmsg_pop(message->message); /* we now own the frame */
-    if (frame == NULL) return Qnil;
+    zframe = zmsg_pop(message->message); /* we now own the frame */
+    if (zframe == NULL) return Qnil;
     VALUE frame_obj = (VALUE)zlist_pop(message->frames);
+    /* detach frame from message, it is now owned by the ruby object */
+    ZmqGetFrame(frame_obj);
+    frame->flags |= ZMQ_FRAME_OWNED;
+    frame->message = NULL;
     return frame_obj ? frame_obj : Qnil;
 }
 

data/lib/zmq/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module ZMQ
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

data/rbczmq.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.authors = ["Lourens Naudé", "James Tucker", "Matt Connolly"]
   s.email = ["lourens@methodmissing.com", "jftucker@gmail.com", "matt.connolly@me.com"]
   s.homepage = "http://github.com/methodmissing/rbczmq"
+  s.license = 'MIT'
   s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.platform = Gem::Platform::RUBY
   s.extensions = "ext/rbczmq/extconf.rb"

data/test/test_message.rb

@@ -291,4 +291,14 @@ class TestZmqMessage < ZmqTestCase
   ensure
     ctx.destroy
   end
+
+  def test_pop_ownership
+    msg = ZMQ::Message.new
+    other = ZMQ::Message.new
+    msg.pushstr "hello"
+    frame = msg.pop
+    other.push frame
+    assert_equal 1, other.size
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbczmq
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Lourens Naudé
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -527,7 +527,8 @@ files:
 - ext/zeromq/tests/testutil.hpp
 - ext/zeromq/version.sh
 homepage: http://github.com/methodmissing/rbczmq
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: