rcstorable 0.3.1 → 0.3.2

data/Rakefile

@@ -12,7 +12,9 @@ begin
     gem.email = "burke.libbey@canadadrugs.com"
     gem.homepage = "http://canadadrugs.com"
     gem.authors = ["Burke Libbey"]
-    gem.files.include '{spec,lib,ext}/**/*'
+    gem.files.include '{spec,lib}/**/*'
+    gem.files.include 'ext/**/*.{c,h,rb}'
+    gem.files.include 'ext/**/{Makefile,Rakefile}'
     gem.extensions = ["ext/extconf.rb"]
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/ext/doc.rb

@@ -0,0 +1,2 @@
+require 'rocco'
+File.open('rcstorable.html','w'){|f|f.puts(Rocco.new('rcstorable.c',[],:language => 'c',:comment_pattern=>/^\s*\/?\*\/?/).to_html)}

data/ext/rcstorable.c

@@ -16,10 +16,13 @@ static void read_n_hash_pairs(VALUE, uint32_t);
 static void read_n_array_entries(VALUE, uint32_t);
 static VALUE read_string(bool);
 static void read_magic_numbers();
-static void check_pointer(uchar*);
+static inline void check_pointer(uchar*);
 
-enum perl_types
-{
+// Perl Storable encodes values with an associated type.
+// There are probably more types than are enumerated here,
+// but I've yet to encounter them.
+
+enum perl_types {
   PT_HASH_KEY   = 1,
   PT_ARRAY      = 2,
   PT_HASH       = 3,
@@ -35,6 +38,8 @@ enum perl_types
 static uchar *serialized;
 static uchar *serialized_end;
 
+static uchar *error_message = "malformed data";
+
 /*
  * Given a perl Storable frozen blob, decode it into a ruby data structure.
  */
@@ -58,12 +63,12 @@ thaw(VALUE self, VALUE str)
  * Malformed strings can theoretically cause segfaults. Segfaults are bad.
  * We'll check pretty much everything we do against the pre-computed end-of-string.
  */
-static void
+static inline void
 check_pointer(uchar *ptr)
 {
-  extern uchar *serialized_end;
+  extern uchar *serialized_end, *error_message;
   if (ptr > serialized_end) {
-    rb_raise(rb_eRangeError, "malformed data");
+    rb_raise(rb_eRangeError, error_message);
   }
 }
 
@@ -155,11 +160,11 @@ static void
 read_n_array_entries(VALUE array, uint32_t num)
 {
   if (num == 0) { return; }
+  read_compact_size();
   rb_ary_push(array, read_object());
   read_n_array_entries(array, num-1);
 }
 
-
 /*
  * Given a size, read in a string of that size. Note that Storable seems to use 319 as a
  * magic value, meaning the string should be read until a very low character is found.
@@ -177,15 +182,17 @@ read_string(bool extended_size)
   uchar *tp = serialized;
 
   if (size == 319) { // apparently Storable uses \000\000\001\077 to mean "read until n<7"
+    printf("319\n");
     while (*tp++ >= 7) {
       check_pointer(tp);
       actual_size++;
     }
+    printf("319:%d\n",actual_size);
     size = actual_size;
   }
   
-  uchar *np = malloc(size+1);
   check_pointer(serialized+size-1);
+  uchar *np = malloc(size+1);
   memcpy(np, serialized, size);
   serialized += size;
   

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rcstorable
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Burke Libbey
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -06:00
+date: 2010-05-10 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +32,7 @@ files:
 - Rakefile
 - VERSION
 - ext/Makefile
+- ext/doc.rb
 - ext/extconf.rb
 - ext/rcstorable.c
 - spec/rcstorable_spec.rb
@@ -44,18 +50,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby C implementation of perl Storable's thaw