regress: fuzzraw: work on fixing Paddr

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index 1b8d019b551c8100404a9eb20f64244b15ceb085..0a23de69dac948ab047949de87b270d30f552eda 100644 (file)
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -145,6 +145,7 @@ static void Paddr(struct sockaddr *addr, int *lenr) {
 
   P_READ(l);
   if (l<0 || l>=sizeof(buf)-1) Pformat("bad addr len");
+  P_read(buf,l,"addrtext");
   buf[l]= 0;
   P_READ(port);
   r= adns_text2addr(buf,port, adns_qf_addrlit_scope_numeric, addr, &sl);

diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index 695b9a23ad48cba92177154fcfaf5d8152460d00..dc7080f386b98b37c26921dd3f167a27fee9a9fa 100644 (file)
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -291,6 +291,14 @@ static void Paddr(struct sockaddr *addr, int *lenr) {
   if (*ep && *ep != ' ') Psyntax("invalid port (bad syntax)");
   if (ul >= 65536) Psyntax("port too large");
 
+  if (Tfuzzrawfile) {
+    int tl = strlen(p);
+    FR_WRITE(tl);
+    FR_write(p,tl);
+    int port_int = ul;
+    FR_WRITE(port_int);
+  }
+
   a.len= sizeof(a.addr);
   err= adns_text2addr(p, (int)ul, 0, &a.addr.sa,&a.len);
   if (err) Psyntax("invalid address");