gphoto4ruby 0.2.4 → 0.2.5

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.2.5
+
+* Another bug with memory allocation fixed
+
 == 0.2.4
 
 * fixed memory allocation bug with CameraFilePath pointer

data/ext/gphoto2camera.c

@@ -51,13 +51,6 @@ VALUE camera_allocate(VALUE klass) {
     return Data_Wrap_Struct(klass, camera_mark, camera_free, c);
 }
 
-void camera_event_mark(GPhoto2CameraEvent *ce) {
-}
-
-void camera_event_free(GPhoto2CameraEvent *ce) {
-    free(ce);
-}
-
 /*
  * call-seq:
  *   GPhoto2::Camera.new(port=nil)
@@ -959,8 +952,9 @@ VALUE camera_wait(int argc, VALUE *argv, VALUE self) {
     switch (ce->type) {
         case GP_EVENT_FILE_ADDED:
         case GP_EVENT_FOLDER_ADDED:
-            c->path = (CameraFilePath*)evtData;
-            ce->path = c->path;
+            ce->path = (CameraFilePath*)evtData;
+            free(c->path);
+            c->path = ce->path;
             strcpy(c->virtFolder, c->path->folder);
             gp_result_check(gp_camera_wait_for_event(c->camera, 100, &fakeType, &fakeData, c->context));
             break;

data/ext/gphoto2camera_event.c

@@ -22,6 +22,13 @@
 
 #include "gphoto2camera_event.h"
 
+void camera_event_mark(GPhoto2CameraEvent *ce) {
+}
+
+void camera_event_free(GPhoto2CameraEvent *ce) {
+    free(ce);
+}
+
 /*
  * call-seq:
  *   type                           =>      string

data/ext/gphoto2camera_event.h

@@ -38,6 +38,9 @@ VALUE rb_cGPhoto2CameraEvent;
 #define EVENT_FILE_ADDED rb_str_new2("file added")
 #define EVENT_FOLDER_ADDED rb_str_new2("folder added")
 
+void camera_event_mark(GPhoto2CameraEvent *ce);
+void camera_event_free(GPhoto2CameraEvent *ce);
+
 VALUE camera_event_type(VALUE self);
 VALUE camera_event_file(VALUE self);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gphoto4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - heq4 company