xmlhash 1.3.4 → 1.3.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.3.5 / 2012-12-21 ("final edition")
+
+* Initialize result so we don't return something random in case of parse error
+
 === 1.3.4 / 2012-12-04
 
 * "upgrade" latin1 and us-ascii to utf-8 automatically

data/ext/xmlhash/xmlhash.c

@@ -203,12 +203,15 @@ static VALUE parse_xml_hash(VALUE self, VALUE rb_xml)
       m_current_encoding = rb_utf8_encoding();
 #endif
 
+  m_result = Qnil;
+
   data = (char*)calloc(RSTRING_LEN(rb_xml), sizeof(char));
   memcpy(data, StringValuePtr(rb_xml), RSTRING_LEN(rb_xml));
 
   reader = xmlReaderForMemory(data, RSTRING_LEN(rb_xml), 
-			      NULL, NULL, XML_PARSE_NOENT);
+			      NULL, NULL, XML_PARSE_NOENT | XML_PARSE_NOERROR | XML_PARSE_NOWARNING );
   init_XmlhashParserData();
+
   if (reader != NULL) {
     ret = xmlTextReaderRead(reader);
     while (ret == 1) {
@@ -217,7 +220,7 @@ static VALUE parse_xml_hash(VALUE self, VALUE rb_xml)
     }
     xmlFreeTextReader(reader);
     if (ret != 0) {
-      printf("%s : failed to parse\n", data);
+      /* printf("%s : failed to parse\n", data); */
     }
   }
 

data/lib/xmlhash.rb

@@ -1,7 +1,7 @@
 require 'xmlhash/xmlhash'
 
 module Xmlhash
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 
   class XMLHash < Hash
     

data/test/test_xmlhash.rb

@@ -62,6 +62,7 @@ eos
       GC.start
       assert_equal ret, rubyoutput
     }
+ 
     10000.times {
       ret = Xmlhash.parse(xml)
       assert_equal ret, rubyoutput
@@ -125,6 +126,12 @@ eos
     assert_equal ret.elements('files'), []
   end
 
+  def test_garbage
+    # unfortunately it's rather challening testing nothing is printed to stderr
+    ret = Xmlhash.parse("asdasdaskdladka")
+    assert_equal nil, ret
+  end
+
   def test_utf8
      xml = '<package name="libconfig" project="home:coolo">
   <title>libconfig &#8211; C/C++ Configuration File Library</title>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlhash
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config