From 56afeb712adc2825fcd140adbd773ffc9d96a04e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 23 Nov 2016 17:26:09 +0000 Subject: [PATCH] regress: Do not crash if fd set fd out of range Signed-off-by: Ian Jackson --- regress/hplayback.c.m4 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4 index 312a04a..481d37b 100644 --- a/regress/hplayback.c.m4 +++ b/regress/hplayback.c.m4 @@ -147,7 +147,8 @@ static void P_updatetime(void) { } static void Pfdset(fd_set *set, int max) { - int r, c; + int c; + unsigned long ul; char *ep; if (!set) { @@ -159,10 +160,10 @@ static void Pfdset(fd_set *set, int max) { FD_ZERO(set); if (vb2.buf[vb2.used] == hm_squote]hm_squote) { vb2.used++; return; } for (;;) { - r= strtoul(vb2.buf+vb2.used,&ep,10); - if (r>=max) Psyntax("fd set member > max"); + ul= strtoul(vb2.buf+vb2.used,&ep,10); + if (ul>=max) Psyntax("fd set member > max"); if (ep == (char*)vb2.buf+vb2.used) Psyntax("empty entry in fd set"); - FD_SET(r,set); + FD_SET(ul,set); vb2.used= ep - (char*)vb2.buf; c= vb2.buf[vb2.used++]; if (c == hm_squote]hm_squote) break; -- 2.30.2