exif 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9c95ed5bae94cb0ba692cc6e2c8f78a24919fd0
-  data.tar.gz: 03eddb0662aefd46ef6d746e6df5e33a70d25df2
+  metadata.gz: 8d658dd771d13abedfe7ab02bfede763a0021132
+  data.tar.gz: 56327a0dade4446064ffbed2a849836598b891dd
 SHA512:
-  metadata.gz: 15be77ed432c2d18fa63b5cdccfeb0349967b8b87851061dd0c296bb4a773e2eedd8e16411896489ca7e70ef4be6df646ed06a70a933f040131985c3bc301492
-  data.tar.gz: e931603d06c4702e4bfc44bf74eb73b22ae4e2f88b4253c6a1402ec85fcb6f0513bd023a46fb499904e598a5297b6177f562105815a38ff0765c4fe1541fa00d
+  metadata.gz: a1e5a4b2d2826d24dcb5d5e2e59a6f1f4df7a2753ed17526b83c236f164d74139f4037833e55f913a5a3dc77f6e32398c9bdf48893f701647305b36ed22980c2
+  data.tar.gz: dd5a25648daaa66665ccc0c3ad9b3da78a2f02b1ee2b77c016ad45d082293c61b4df75590f82584722b7806b08add02c98cd8e1aaee13aa9b32dd9d40788645d

data/ext/exif/data.c

@@ -1,6 +1,7 @@
 #include "data.h"
 #include "ruby.h"
 
+#include <libexif/exif-log.h>
 #include <libexif/exif-data.h>
 #include <libexif/exif-loader.h>
 #include <stdint.h>
@@ -171,6 +172,15 @@ static VALUE exif_entry_to_rb_value(ExifEntry *);
 static VALUE rational_to_num(ExifRational rational);
 static VALUE srational_to_num(ExifSRational srational);
 
+static void exif_corrupt_log_func(ExifLog *log, ExifLogCode code,
+                                  const char *domain, const char *format,
+                                  va_list args, void *data) {
+  if (code == EXIF_LOG_CODE_CORRUPT_DATA) {
+    unsigned int *corrupt = (unsigned int *)data;
+    *corrupt = 1;
+  }
+}
+
 void init_data() {
   int length;
 
@@ -186,21 +196,38 @@ void init_data() {
 
 VALUE new (VALUE self, VALUE input) {
   ExifData *ed;
-  VALUE read_data;
 
-  if (TYPE(input) == T_STRING)
-    read_data = input;
-  else if (rb_respond_to(input, rb_intern("read")))
-    read_data = rb_funcall(input, rb_intern("read"), 0);
-  else
+  if (TYPE(input) != T_STRING && !rb_respond_to(input, rb_intern("read")))
     rb_raise(rb_eTypeError, "wrong argument type %s (expected String or IO)",
              rb_obj_classname(input));
 
-  ExifLoader *loader = exif_loader_new();
-  exif_loader_write(loader, (unsigned char *)RSTRING_PTR(read_data),
-                    RSTRING_LEN(read_data));
-  ed = exif_loader_get_data(loader);
-  exif_loader_unref(loader);
+  if (TYPE(input) == T_STRING) {
+    unsigned int corrupt = 0;
+    ExifLog *log = exif_log_new();
+    exif_log_set_func(log, exif_corrupt_log_func, (void *)&corrupt);
+    ed = exif_data_new();
+    exif_data_log(ed, log);
+    exif_data_load_data(ed, (unsigned char *)RSTRING_PTR(input),
+                        RSTRING_LEN(input));
+    exif_log_unref(log);
+    if (corrupt) {
+      exif_data_free(ed);
+      ed = NULL;
+    }
+  } else {
+    ExifLoader *loader = exif_loader_new();
+    VALUE buffer;
+    while (1) {
+      buffer = rb_funcall(input, rb_intern("read"), 1, INT2FIX(1024));
+      if (TYPE(buffer) == T_NIL)
+        break;
+      if (!exif_loader_write(loader, (unsigned char *)RSTRING_PTR(buffer),
+                             RSTRING_LEN(buffer)))
+        break;
+    }
+    ed = exif_loader_get_data(loader);
+    exif_loader_unref(loader);
+  }
   if (!ed)
     rb_raise(rb_eNotReadable, "File not readable or no EXIF data in file.");
 

data/lib/exif/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Exif
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exif
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jian Weihang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler