From 5b8ab62480201e9bdd7d7203582e02501a0671f5 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Nov 2016 21:55:28 +0000
Subject: [PATCH] regress: fuzzraw: fixes and improvements to Paddr and Pbytes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 regress/hfuzzraw.c.m4  | 25 ++++++++++++-------------
 regress/hplayback.c.m4 |  4 ++--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index 0a23de6..8229355 100644
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -138,28 +138,28 @@ void T_gettimeofday_hook(void) {
 }
 
 static void Paddr(struct sockaddr *addr, int *lenr) {
-  int l, r;
+  int al, r;
   uint16_t port;
   char buf[512];
   socklen_t sl = *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(al);
+  if (al<0 || al>=sizeof(buf)-1) Pformat("bad addr len");
+  P_read(buf,al,"addrtext");
+  buf[al]= 0;
   P_READ(port);
   r= adns_text2addr(buf,port, adns_qf_addrlit_scope_numeric, addr, &sl);
   if (r==EINVAL) Pformat("bad addr text");
-  assert(r==ENOSPC);
+  assert(r==0 || r==ENOSPC);
   *lenr = sl;
 }
 
 static int Pbytes(byte *buf, int maxlen) {
-  int l;
-  P_READ(l);
-  if (l<0 || l>maxlen) Pformat("bad byte block len");
-  P_read(buf, l, "bytes");
-  return l;
+  int bl;
+  P_READ(bl);
+  if (bl<0 || bl>maxlen) Pformat("bad byte block len");
+  P_read(buf, bl, "bytes");
+  return bl;
 }
 
 static void Pfdset(fd_set *set, int max, int *r_io) {
@@ -264,8 +264,7 @@ int H$1(hm_args_massage($3,void)) {
   }
  ')
  m4_define(`hm_rv_len',`
-  hm_rv_any
-  if (r>($'`1)) Pformat("syscall length return is excessive");
+  hm_rv_succfail
  ')
  m4_define(`hm_rv_must',`
   r= 0;
diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index dc7080f..be46e08 100644
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -295,8 +295,8 @@ static void Paddr(struct sockaddr *addr, int *lenr) {
     int tl = strlen(p);
     FR_WRITE(tl);
     FR_write(p,tl);
-    int port_int = ul;
-    FR_WRITE(port_int);
+    uint16_t port16 = ul;
+    FR_WRITE(port16);
   }
 
   a.len= sizeof(a.addr);
-- 
2.30.2