dnssd 0.6.0 → 0.7.0

data/ext/rdnssd_tr.c

@@ -9,12 +9,6 @@
 
 static VALUE cDNSSDTextRecord;
 
-static void
-dnssd_tr_decode_error(void)
-{
-	rb_raise(rb_eArgError, "buffer contains invalid text record");
-}
-
 static void
 dnssd_tr_decode_buffer(VALUE self, long buf_len, const char *buf_ptr)
 {
@@ -24,18 +18,29 @@ dnssd_tr_decode_buffer(VALUE self, long buf_len, const char *buf_ptr)
 		VALUE key, value;
 		const char *p;
 		long key_len, len = (long)(uint8_t)buf_ptr[i++];
-		if (i >= buf_len || i + len > buf_len)
-			dnssd_tr_decode_error();
+		if (i + len > buf_len)
+      rb_raise(rb_eArgError, "invalid text record (string longer than buffer)");
+
+    if (len == 0) {
+      /* 0-length key/value, handle this by skipping over it.
+       * Probably the RR should have zero-length, but some services have been
+       * found to advertise a non-zero length TXT record, with a zero-length
+       * key/value string.
+       */
+      continue;
+    }
 
-		p = strchr(buf_ptr + i, '=');
+		p = memchr(buf_ptr + i, '=', buf_len - i);
 		if (p == NULL) {
+      /* key, with no value, this is OK */
 			key_len = len;
 			key = rb_str_new(buf_ptr + i, key_len);
 			value = Qnil;
 		} else {
 			key_len = p - (buf_ptr + i);
-			if (key_len >= len)
-				dnssd_tr_decode_error();
+      if(key_len == 0)
+         rb_raise(rb_eArgError, "invalid text record (zero-length key)");
+
 			key = rb_str_new(buf_ptr + i, key_len);
 			key_len++; /* step over '=' */
 			value = rb_str_new(buf_ptr + i + key_len, len - key_len);

metadata

@@ -1,47 +1,71 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
-specification_version: 1
 name: dnssd
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2004-10-07
-summary: DNS Service Discovery (aka Rendezvous) API for Ruby
-require_paths: 
-  - lib
-  - ext
-author: Charlie Mills
-email: cmills@freeshell.org
-homepage: http://dnssd.rubyforge.org
-rubyforge_project: 
-description: 
+  version: 0.7.0
+platform: ruby
+authors: 
+- Charlie Mills
 autorequire: dnssd
-default_executable: 
 bindir: bin
+cert_chain: []
+
+date: 2008-08-05 00:00:00 -06:00
+default_executable: 
+dependencies: []
+
+description: 
+email: cmills@freeshell.org
+executables: []
+
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: []
+
+files: 
+- lib/dnssd
+- lib/dnssd.rb
+- ext/dns_sd.h
+- ext/extconf.rb
+- ext/Makefile
+- ext/MANIFEST
+- ext/mkmf.log
+- ext/rdnssd.bundle
+- ext/rdnssd.c
+- ext/rdnssd.h
+- ext/rdnssd.o
+- ext/rdnssd_service.c
+- ext/rdnssd_service.o
+- ext/rdnssd_structs.c
+- ext/rdnssd_structs.o
+- ext/rdnssd_tr.c
+- ext/rdnssd_tr.o
+- ext/run_rdoc
 has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
+homepage: http://dnssd.rubyforge.org
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+- ext
+required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
-platform: ruby
-files: 
-  - lib/dnssd.rb
-  - ext/dns_sd.h
-  - ext/extconf.rb
-  - ext/MANIFEST
-  - ext/rdnssd.c
-  - ext/rdnssd.h
-  - ext/rdnssd_service.c
-  - ext/rdnssd_structs.c
-  - ext/rdnssd_tr.c
-  - ext/run_rdoc
-test_files: []
-rdoc_options: []
-extra_rdoc_files: []
-executables: []
-extensions: 
-  - ext/extconf.rb
 requirements: []
-dependencies: []
+
+rubyforge_project: 
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: DNS Service Discovery (aka Rendezvous) API for Ruby
+test_files: []
+