Fixes #9 segfaults with empty strings

Not the most lovable fix but functional
asee · Sep 24, 2017 · 6eba093 · 6eba093
1 parent 8572fc8
commit 6eba093
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/ext/pdf417/pdf417.c b/ext/pdf417/pdf417.c
@@ -63,16 +63,20 @@ static VALUE rb_pdf417_lib_encode_text(VALUE self, VALUE text) {
   pdf417init(&p);
   p.text = StringValuePtr(text);
   p.lenText = (int)RSTRING_LEN(text);
+
+  if(p.lenText == 0){
+    return rb_ary_new2(0);
+  }
+
   fetchCodewords(&p);
   if (p.error) {
       pdf417free(&p);
       return Qnil; //could also return list or raise something
   }
-  
+
   list = rb_ary_new2(p.lenCodewords);
-  
+
   pdf417free(&p); 
-
   for (k = 0; k < p.lenCodewords; ++k) {
     rb_ary_push(list, INT2NUM(p.codewords[k]));
   }
@@ -125,6 +129,11 @@ static VALUE rb_pdf417_lib_codewords(VALUE self) {
   pdf417init(&p);
   p.text = StringValuePtr(text);
   p.lenText = (int)RSTRING_LEN(text);
+
+  if(p.lenText == 0){
+    return rb_ary_new2(0);
+  }
+
   fetchCodewords(&p);
   if (p.error) {
       pdf417free(&p);

diff --git a/test/pdf417/lib_test.rb b/test/pdf417/lib_test.rb
@@ -1,6 +1,10 @@
 require 'test_helper'
 
 class PDF417::Lib::LibTest <  Minitest::Test
+
+  should "not fail init with empty text" do
+    assert PDF417::Lib.new(text: '')
+  end
 
   should "initialize text" do
     b = PDF417::Lib.new("fred")
@@ -61,9 +65,8 @@ class PDF417::Lib::LibTest <  Minitest::Test
     refute_equal with_null_bytes, without_null_bytes
   end
 
-  should "not fail with empty text" do
+  should "not fail encode_text with empty text" do
     assert_equal [], PDF417::Lib.encode_text("")
-  end
-
+  end  
 
 end