ruby-filemagic 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f198a83b3db203dc0cc3b9f990dbea13526623
-  data.tar.gz: 0b8119e1d47e05d65c3ffb729b8a52c254f340ab
+  metadata.gz: 3eb3ecc3b55441028fac03c58ce23b94b4535489
+  data.tar.gz: fe98ff3cc87c0bcc11aec60b4e4e1297dd296a4a
 SHA512:
-  metadata.gz: 8a469ee433bb3f4f67dc1597726129f64818c55afe987cad611cde6a15e73f056c120ad4ee26fd346b4ce73061815ced19505cc16f29b0e3fee35b02b705c3c1
-  data.tar.gz: c733f22088488246b0d54deb450cc3014e8bafd1eabd0122c97309596c840aa148646d398de164eab8488e4603278277f736eb2dc1da70fcfd0ecf358583b9ca
+  metadata.gz: b68a7914cf407d134b75e230b7fa61f2a07bcc9c4d1811203265e4a05c675f69e0f65b02b5453174943c9fe824fcc661467399af81477e87c2daa4d17333fce6
+  data.tar.gz: e7e784821698c04c53a3d04fa011fbea772549c6d10fa92487e245711ed7e20def7cb1c9d07c5913a82c92aff9d1e81c2d29140c19f22ad8e15b6f34b7f4293d

data/ChangeLog

@@ -2,6 +2,11 @@
 
 = Revision history for ruby-filemagic
 
+== 0.7.2 [2017-07-02]
+
+* Fix segfault on <tt>buffer(nil)</tt> when compiled with GCC (pull request
+  #24 by Yuya Tanaka).
+
 == 0.7.1 [2015-10-27]
 
 * List default lib and header directories (pull request #18 by Adam Wróbel).

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.7.1
+This documentation refers to filemagic version 0.7.2
 
 
 == DESCRIPTION
@@ -38,24 +38,33 @@ FileMagic extension module. See also libmagic(3), file(1) and magic(4).
   require 'filemagic'
 
   p FileMagic::VERSION
+  # => "0.7.2"
   p FileMagic::MAGIC_VERSION
+  # => "5.28"
 
   p FileMagic.new.flags
+  # => []
 
   FileMagic.open(:mime) { |fm|
     p fm.flags
+    # => [:mime_type, :mime_encoding]
     p fm.file(__FILE__)
+    # => "text/plain; charset=us-ascii"
     p fm.file(__FILE__, true)
+    # => "text/plain"
 
     fm.flags = [:raw, :continue]
     p fm.flags
+    # => [:continue, :raw]
   }
 
   fm = FileMagic.new
   p fm.flags
+  # => []
 
   mime = FileMagic.mime
   p mime.flags
+  # => [:mime_type, :mime_encoding]
 
 === Environment
 

data/Rakefile

@@ -21,6 +21,7 @@ begin
       homepage:    :blackwinter,
       local_files: [mgc],
       extension:   {
+        cross_compile: false,
         with_cross_gnurx: lambda { |dir| [dir] },
         with_cross_magic: lambda { |dir| [src =
           File.join(dir, 'src'), File.join(src, '.libs')] }

data/ext/filemagic/filemagic.c

@@ -112,6 +112,7 @@ rb_magic_init(int argc, VALUE *argv, VALUE self) {
 
   rb_iv_set(self, "iflags", flags);
   rb_iv_set(self, "closed", Qfalse);
+  rb_iv_set(self, "@simplified", Qfalse);
 
   keys = rb_funcall(options, rb_intern("keys"), 0);
 

data/ext/filemagic/filemagic.h

@@ -18,9 +18,9 @@
   }\
 }
 
-#define RB_MAGIC_TYPE_FILE       magic_file(ms, StringValuePtr(arg))
-#define RB_MAGIC_TYPE_BUFFER     magic_buffer(ms, StringValuePtr(arg), RSTRING_LEN(arg))
-#define RB_MAGIC_TYPE_DESCRIPTOR magic_descriptor(ms, NUM2INT(arg))
+#define RB_MAGIC_TYPE_FILE       type = magic_file(ms, StringValuePtr(arg));
+#define RB_MAGIC_TYPE_BUFFER     { char *arg_str = StringValuePtr(arg); type = magic_buffer(ms, arg_str, RSTRING_LEN(arg)); }
+#define RB_MAGIC_TYPE_DESCRIPTOR type = magic_descriptor(ms, NUM2INT(arg));
 
 #define RB_MAGIC_TYPE(what, WHAT) \
 static VALUE \
@@ -32,7 +32,8 @@ rb_magic_##what(int argc, VALUE *argv, VALUE self) {\
   rb_scan_args(argc, argv, "11", &arg, &simple);\
   GetMagicSet(self, ms);\
 \
-  if ((type = RB_MAGIC_TYPE_##WHAT) == NULL) {\
+  RB_MAGIC_TYPE_##WHAT\
+  if (type == NULL) {\
     rb_raise(rb_FileMagicError, "failed lookup: %s", magic_error(ms));\
   }\
 \

data/lib/filemagic/version.rb

@@ -4,7 +4,7 @@ class FileMagic
 
     MAJOR = 0
     MINOR = 7
-    TINY  = 1
+    TINY  = 2
 
     class << self
 

data/test/filemagic_test.rb

@@ -62,6 +62,12 @@ magic file from #{FileMagic.path}
     assert_equal('POSIX shell script, ASCII text executable', res)
   end
 
+  def test_nil_buffer
+    fm = FileMagic.new(FileMagic::MAGIC_NONE)
+    assert_raise(TypeError) { fm.buffer(nil) }
+    fm.close
+  end
+
   def test_descriptor
     fm = FileMagic.new(FileMagic::MAGIC_NONE)
 

data/test/pylink

@@ -0,0 +1 @@
+test/pyfile

metadata

@@ -1,15 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: ruby-filemagic
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Travis Whitton
 - Jens Wille
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQswCQYDVQQDDAJ3dzEb
+  MBkGCgmSJomT8ixkARkWC2JsYWNrd2ludGVyMRIwEAYKCZImiZPyLGQBGRYCZGUw
+  HhcNMTMwMTMxMDkyMjIyWhcNMTQwMTMxMDkyMjIyWjA+MQswCQYDVQQDDAJ3dzEb
+  MBkGCgmSJomT8ixkARkWC2JsYWNrd2ludGVyMRIwEAYKCZImiZPyLGQBGRYCZGUw
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVXmfa6rbTwKOvtuGoROc1
+  I4qZjgLX0BA4WecYB97PjwLJmJ1hRvf9JulVCJYYmt5ZEPPXbgi9xLbcp6ofGmnC
+  i68/kbhcz20/fRUtIJ2phU3ypQTEd2pFddpL7SR2FxLkzvvg5E6nslGn7o2erDpO
+  8sm610A3xsgT/eNIr9QA7k4pHh18X1KvZKmmQR4/AjVyKmKawzauKUoHHepjvjVs
+  s0pVoM7UmOmrS4SafQ3OwUo37f19CVdN2/FW7z3e5+iYhKxdIFdhniX9iDWtA3Jn
+  7oUOtiolhCRK4P/c30UjTCDkRkOldsWciFUasROJ5VAV2SVv7FtGHoQLDZ/++tRr
+  AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFIAPWU4BEoYUe82hY/0EkoGd
+  Oo/WMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAf2YnB0mj42of22dA
+  MimgJCAEgB3H5aHbZ6B5WVnFvrC2UUnhP+/kLj/6UgOfqcasy4Xh62NVGuNrf7rF
+  7NMN87XwexGuU2GCpIMUd6VCTA7zMP2OWuXEcba7jT5OtiI55buO0J4CRtyeX1XF
+  qwlGgx4ItcGhMTlDFXj3IkpeVtjD8O7yWE21bHf9lLURmqK/r9KjoxrrVi7+cESJ
+  H19TDW3R9p594jCl1ykPs3dz/0Bk+r1HTd35Yw+yBbyprSJb4S7OcRRHCryuo09l
+  NBGyZvOBuqUp0xostWSk0dfxyn/YQ7eqvQRGBhK1VGa7Tg/KYqnemDE57+VOXrua
+  59wzaA==
+  -----END CERTIFICATE-----
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hen
@@ -20,7 +41,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +51,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -111,13 +132,14 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  ruby-filemagic-0.7.1 [2015-10-27]:
+  ruby-filemagic-0.7.2 [2017-07-02]:
 
-  * List default lib and header directories (pull request #18 by Adam Wróbel).
+  * Fix segfault on <tt>buffer(nil)</tt> when compiled with GCC (pull request
+    #24 by Yuya Tanaka).
 
 rdoc_options:
 - "--title"
-- ruby-filemagic Application documentation (v0.7.1)
+- ruby-filemagic Application documentation (v0.7.2)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -138,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to the magic(4) library

data/test/pylink

@@ -1 +0,0 @@
-"""