From 3861fcbbb209d39ac308fa607a8aee9322dbf433 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@improbable.io>
Date: Fri, 7 Aug 2015 16:26:37 +0100
Subject: [PATCH] Fix HIP parsing

---
 fuzz_test.go | 5 ++---
 zscan_rr.go  | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fuzz_test.go b/fuzz_test.go
index 20dcc072..7cadb62e 100644
--- a/fuzz_test.go
+++ b/fuzz_test.go
@@ -7,16 +7,15 @@ func TestFuzzString(t *testing.T) {
 		";a ", ";a����������",
 		"	NSAP O ", "  NSAP N ",
 		" TYPE4 TYPE6a789a3bc0045c8a5fb42c7d1bd998f5444 IN 9579b47d46817afbd17273e6",
-//		"   HIP 0 e e @  . .",
 	}
 	for i, tc := range testcases {
 		rr, err := NewRR(tc)
 		if err == nil {
-			// rr can still be nil because we can (for instance) just parse a comment
+			// rr can be nil because we can (for instance) just parse a comment
 			if rr == nil {
 				continue
 			}
-			t.Fatalf("parsed mailformed RR %d: %s", i, rr.String)
+			t.Fatalf("parsed mailformed RR %d: %s", i, rr.String())
 		}
 	}
 }
diff --git a/zscan_rr.go b/zscan_rr.go
index 5030cf7b..dc87ff37 100644
--- a/zscan_rr.go
+++ b/zscan_rr.go
@@ -1054,6 +1054,7 @@ func setHIP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 		case zString:
 			if l.token == "@" {
 				xs = append(xs, o)
+				l = <-c
 				continue
 			}
 			_, ok := IsDomainName(l.token)