libarchive-ruby-swig 0.6.2 → 0.6.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c98f6a7357e2915fb16b63b73144982a19643f0e
+  data.tar.gz: a305c9b8fbd5ebb3bf0806f0ea1acb1f8192fda9
+SHA512:
+  metadata.gz: 5912dea5f84918a2d60bad82460040b4f04e0a17fd08352b8221d62af49031f73a67c44ac1ce1c6e3fecdccf23b80ed8db787776c33b0593bfa4d08ab85c8cd4
+  data.tar.gz: 108b6cfbe75fdf22a11faf0c4025b4b456fe3db419a9cfc7341f0b6622dba911f1e2124593b410785ec4a4034d24a203e9865eca9946c15415cc24728442e6e4

data/ext/libarchive-ruby-swig/libarchive.i

@@ -30,7 +30,7 @@
 /* --- WRAPPER CODE START --- */
 %}
 
-%apply (char *STRING, int LENGTH) { (const char *string, int length) };
+%apply (char *STRING, size_t LENGTH) { (const char *string, size_t length) };
 
 %include "stat.h"
 %include "reader.h"

data/ext/libarchive-ruby-swig/reader.cpp

@@ -81,11 +81,22 @@ Reader *Reader::read_open_filename(const char *filename, const char *cmd, bool r
 }
 
 
-Reader *Reader::read_open_memory(const char *string, int length,
+Reader *Reader::read_open_memory(const char *string, size_t length,
     const char *cmd, bool raw)
 {
     struct archive *ar = archive_read_new();
+
+    if (!ar) {
+        throw Error("Unable to allocate libarchive handle!");
+    }
+
     char *content = (char*) malloc(length);
+
+    if (!content) {
+        archive_read_free(ar);
+        throw Error("Unable to allocate memory when duplicating buffer");
+    }
+
     memcpy((void*) content, (void*) string, length);
 
     try {
@@ -150,7 +161,7 @@ Entry *Reader::next_header()
 }
 
 
-VALUE Reader::read_data_helper(int len)
+VALUE Reader::read_data_helper(size_t len)
 {
     std::string error_msg = "error while reading from archive";
 

data/ext/libarchive-ruby-swig/reader.h

@@ -44,18 +44,18 @@ class Reader
 %feature("autodoc", "Use <code>Archive::read_open_filename</code> instead") read_open_filename;
 %newobject read_open_filename(const char *filename, const char *cmd = 0, bool raw = false);
 %feature("autodoc", "Use <code>Archive::read_open_memory</code> instead") read_open_memory;
-%newobject read_open_memory(const char *string, int length, const char *cmd = 0, bool raw = false);
+%newobject read_open_memory(const char *string, size_t length, const char *cmd = 0, bool raw = false);
 %feature("autodoc", "Returns the next Entry meta data object in the Archive") next_header;
 %newobject next_header();
 #endif
 
         static Reader *read_open_filename(const char *filename,
             const char *cmd = 0, bool raw = false);
-        static Reader *read_open_memory(const char *string, int length,
+        static Reader *read_open_memory(const char *string, size_t length,
             const char *cmd = 0, bool raw = false);
 
         Entry *next_header();
-        VALUE read_data_helper(int len);
+        VALUE read_data_helper(size_t len);
 
 #ifdef SWIG
 %exception;
@@ -64,7 +64,7 @@ class Reader
     private:
         struct archive *_ar;
         char *_buf;
-        int _buf_size;
+        size_t _buf_size;
         char *_archive_content;
 };
 

data/ext/libarchive-ruby-swig/writer.cpp

@@ -17,18 +17,13 @@
 #include "error.h"
 
 Writer::Writer(struct archive *ar)
-    :_ar(ar),
-    _buf(0),
-    _buf_size(0)
+    :_ar(ar)
 {}
 
 
 Writer::~Writer()
 {
     this->close();
-    free(_buf);
-    _buf = 0;
-    _buf_size = 0;
 }
 
 
@@ -139,9 +134,9 @@ void Writer::write_header(Entry *entry)
 }
 
 
-void Writer::write_data_helper(const char *string, int length)
+void Writer::write_data_helper(const char *string, size_t length)
 {
-    if(archive_write_data(_ar, (void*) string, length) == -1) {
+    if(archive_write_data(_ar, (const void *) string, length) == -1) {
         std::string error_msg = archive_error_string(_ar);
         throw Error(error_msg);
     }

data/ext/libarchive-ruby-swig/writer.h

@@ -90,7 +90,7 @@ class Writer
         #endif
         void write_header(Entry *entry);
 
-        void write_data_helper(const char *string, int length);
+        void write_data_helper(const char *string, size_t length);
 
 #ifdef SWIG
 %exception;
@@ -106,8 +106,6 @@ class Writer
         static void set_format_helper(struct archive *ar, int format);
 
         struct archive *_ar;
-        char *_buf;
-        int _buf_size;
 
         std::map<unsigned long, std::map<unsigned long, std::string> > _hardlinks;
 };

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libarchive-ruby-swig
 version: !ruby/object:Gem::Version
-  version: 0.6.2
-  prerelease: 
+  version: 0.6.3
 platform: ruby
 authors:
 - Tobias Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies: []
 description: Ruby bindings to libarchive allowing reading and creation of compressed
   archives in a variety of formats.
@@ -19,41 +18,40 @@ extensions:
 - ext/libarchive-ruby-swig/extconf.rb
 extra_rdoc_files: []
 files:
-- lib/libarchive_rs.rb
-- ext/libarchive-ruby-swig/stat.cpp
-- ext/libarchive-ruby-swig/stat.h
 - ext/libarchive-ruby-swig/entry.cpp
 - ext/libarchive-ruby-swig/entry.h
 - ext/libarchive-ruby-swig/error.cpp
 - ext/libarchive-ruby-swig/error.h
+- ext/libarchive-ruby-swig/extconf.rb
 - ext/libarchive-ruby-swig/libarchive.i
 - ext/libarchive-ruby-swig/reader.cpp
 - ext/libarchive-ruby-swig/reader.h
+- ext/libarchive-ruby-swig/stat.cpp
+- ext/libarchive-ruby-swig/stat.h
 - ext/libarchive-ruby-swig/writer.cpp
 - ext/libarchive-ruby-swig/writer.h
-- ext/libarchive-ruby-swig/extconf.rb
+- lib/libarchive_rs.rb
 homepage: http://libarchive-rs.rubyforge.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: Libarchive/Ruby/SWIG
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings to libarchive
 test_files: []