rcstorable 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/ext/rcstorable.c

@@ -38,15 +38,26 @@ enum hash_key_types
 
 // Used globally. Raptors. I know.
 unsigned char *serialized;
+unsigned char *serialized_end;
+
+void
+check_pointer(unsigned char *ptr)
+{
+  extern unsigned char *serialized_end;
+  if (ptr > serialized_end) {
+    rb_raise(rb_eRangeError, "malformed data");
+  }
+}
 
 VALUE
 thaw(VALUE self, VALUE str)
 {
   Check_Type(str, T_STRING);
-  extern unsigned char *serialized;
+  extern unsigned char *serialized, *serialized_end;
 
   serialized = RSTRING_PTR(str);
-
+  serialized_end = serialized + RSTRING_LEN(str);
+  
   read_magic_numbers();
   
   return read_object();
@@ -63,6 +74,7 @@ VALUE
 read_object()
 {
   extern unsigned char *serialized;
+  check_pointer(serialized);
   int type = *serialized++;
   int size = read_extended_size();
 
@@ -90,7 +102,8 @@ void
 read_n_hash_pairs(VALUE hash, int num)
 {
   extern unsigned char *serialized;
-
+  check_pointer(serialized);
+  
   if (num == 0) {
     return;
   }
@@ -122,7 +135,8 @@ void
 read_n_array_entries(VALUE array, int num)
 {
   extern unsigned char *serialized;
-
+  check_pointer(serialized);
+  
   if (num == 0) {
     return;
   }
@@ -146,7 +160,8 @@ VALUE
 read_string(bool extended_size)
 {
   extern unsigned char *serialized;
-
+  check_pointer(serialized);
+  
   int size = extended_size ? read_extended_size() : read_compact_size();
   int actual_size = 0;
   int rem;
@@ -154,17 +169,18 @@ read_string(bool extended_size)
 
   if (size == 319) { // apparently Storable uses \000\000\001\077 to mean "read until n<10"
     while (*tp++ >= 10) {
+      check_pointer(tp);
       actual_size++;
     }
     size = actual_size;
   }
-
   rem = size;
   
   char *np = malloc(size * sizeof(char) + 1);
   char *cnp = np;
   
   while (rem > 0) {
+    check_pointer(serialized);
     rem--;
     *cnp++ = *serialized++;
   }
@@ -182,7 +198,8 @@ read_extended_size()
 {
   extern unsigned char *serialized;
   int size = 0;
-
+  check_pointer(serialized);
+  
   serialized++;
   serialized++;
   size += 256*(*serialized++);
@@ -196,6 +213,7 @@ read_extended_size()
  */
 int
 read_compact_size() {
+  check_pointer(serialized);
   extern unsigned char *serialized;
   return *serialized++;
 }

data/spec/rcstorable_spec.rb

@@ -2,11 +2,29 @@ require 'rcstorable'
 
 describe RCStorable do
 
-  it "should correctly decode output" do
-    input = "\005\006#{File.read(File.join(File.dirname(__FILE__),'test.store'))}"
 
-    puts RCStorable.thaw(input).inspect
+  it "should correctly decode format A" do
+    store = "\005\006\003\000\000\000\005\005\000\000\000\aAaaaaaa\004\003\000\000\000\017\n\fasdjfsadfjfd\000\000\000\tdkjfjaksj\n\00560565\000\000\000\nksdjfksjdf\n\020aksjgjeijpqiwjff\000\000\000\020ksdjfkasjfkjefjj\n\022ewjfklqjkzxjfnvnds\000\000\000\ajfjwjwj\n\nlsakdvnnff\000\000\000\004qpwo\n\002jf\000\000\000\005qwojf\n\bzxemffew\000\000\000\005owjff\n\004zjxf\000\000\000\016jzxmfnfkneoqjf\n\003jas\000\000\000\aowfjjwf\n\003jfw\000\000\000\rjadsnzxfkjfej\n\005oqwfj\000\000\000\bqpwofjff\n\004owjf\000\000\000\njzxnfnqwwf\n\000\000\000\000\nqpwofjfjww\n\000\000\000\000\vpdofjfejqwj\n\002jf\000\000\000\vpwqofjwjqfj\000\000\000\apojsfww\005\000\000\000\005posjf\004\002\000\000\000\001\001\000\000\001?sdlkfjewigjepofjqwpfjsdalkfjqepogjgpojqwfpowejfqpowfjlksdjdslkgjsdflgjerhgi;oerhjgoiprejwgioperjgkl;djglsdk;fgjsdlkf;gjal;gfjerigjergkjarigojaegkl;sdfnga;lksfjwi;eogjieryjkw;ljfa;sdlgkhjaglkajwegf;lkajgaweklfhajklghawejklghawejkhawelurhaewtluiawehtawlkjehfasjkldfnasjklfhsadfjklashfluiewhwlquthqluitqwyeoiuthwefjklasdhfkjlasdfnbasjlkdfhqweuiltqytoeqwieutyqoeto9845yhsjdaghfajkewntewakjlhtawkerhweuirhaweruhewiurahwefljkshdafjhadkf\n\000\000\000\003oje\005\000\000\000\016lsdkfjlkfjqwtr"
+
+    expected = {"Aaaaaaa"=>nil, "lsdkfjlkfjqwtr"=>nil, "posjf"=>nil, "oje"=>["sdlkfjewigjepofjqwpfjsdalkfjqepogjgpojqwfpowejfqpowfjlksdjdslkgjsdflgjerhgi;oerhjgoiprejwgioperjgkl;djglsdk;fgjsdlkf;gjal;gfjerigjergkjarigojaegkl;sdfnga;lksfjwi;eogjieryjkw;ljfa;sdlgkhjaglkajwegf;lkajgaweklfhajklghawejklghawejkhawelurhaewtluiawehtawlkjehfasjkldfnasjklfhsadfjklashfluiewhwlquthqluitqwyeoiuthwefjklasdhfkjlasdfnbasjlkdfhqweuiltqytoeqwieutyqoeto9845yhsjdaghfajkewntewakjlhtawkerhweuirhaweruhewiurahwefljkshdafjhadkf\n"], "pojsfww"=>{"jfjwjwj"=>"ewjfklqjkzxjfnvnds", "qpwo"=>"lsakdvnnff", "ksdjfksjdf"=>"60565", "pdofjfejqwj"=>"", "owfjjwf"=>"jas", "owjff"=>"zxemffew", "jzxnfnqwwf"=>"owjf", "qpwofjff"=>"oqwfj", "jadsnzxfkjfej"=>"jfw", "ksdjfkasjfkjefjj"=>"aksjgjeijpqiwjff", "pwqofjwjqfj"=>"jf", "dkjfjaksj"=>"asdjfsadfjfd", "qpwofjfjww"=>"", "jzxmfnfkneoqjf"=>"zjxf", "qwojf"=>"jf"}}
+
+    RCStorable.thaw(store).should == expected
+  end
     
+  it "should correctly decode format B" do
+    store = "004\a\b12345678\004\b\b\b\003\004\000\000\000\004\003\002\000\000\000\n\004blah\001\000\000\000p\001>\002\000\000Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.\001\000\000\000q\001\000\000\000c\n\00229\017\000\000\000longer_key_name\n\020A longish string\001\000\000\000a\n\00235\001\000\000\000b"
+
+    expected = {
+      "a" => "A longish string",
+      "b" => "35",
+      "c" => {
+        "p" => "blah", 
+        "q" => "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
+      },
+      "longer_key_name" => "29"
+    }
+
+    RCStorable.thaw(store).should == expected
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rcstorable
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Burke Libbey