regress: fuzzraw: read new fds from stream

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

diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index 24aff421d8c97bda8b1e7f1c174dd23c919f8f4c..15980450092e7043833c0126847e206f9e8ee2ae 100644 (file)
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -216,15 +216,17 @@ int H$1(hm_args_massage($3,void)) {
  m4_define(`hm_rv_fd',`
   hm_rv_succfail
   if (!r) {
-    for (;;) {
-      assert(r < 1000);
-      if (r >= fdtab.used)
-        if (!adns__vbuf_append(&fdtab,"\0",1)) Tnomem();
-      assert(r < fdtab.used);
-      if (!(fdtab.buf[r] & FDF_OPEN)) break;
-      r++;
+    int newfd;
+    P_READ(newfd);
+    if (newfd<0 || newfd>1000) Pformat("new fd out of range");
+    adns__vbuf_ensure(&fdtab, newfd+1);
+    if (fdtab.used <= newfd) {
+      memset(fdtab.buf+fdtab.used, 0, newfd+1-fdtab.used);
+      fdtab.used= newfd+1;
     }
-    fdtab.buf[r] |= FDF_OPEN;
+    if (fdtab.buf[newfd]) Pformat("new fd already in use");
+    fdtab.buf[newfd] |= FDF_OPEN;
+    r= newfd;
  }
  ')
  $2