Date: Mon, 13 Jun 2022 12:50:13 +0000 From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 264656] sh(1): should disregard trailing blanks in variables in arithmetic expressions. Message-ID: <bug-264656-227-F1V1WJ6mE7@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-264656-227@https.bugs.freebsd.org/bugzilla/> References: <bug-264656-227@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D264656 --- Comment #1 from Rajeev Pillai <rajeev_v_pillai@yahoo.com> --- A better patch is this one (saves 2 function calls): ---START--- diff -urN bin/sh.orig/arith_yacc.c bin/sh/arith_yacc.c --- bin/sh.orig/arith_yacc.c 2022-05-12 04:53:55.000000000 +0000 +++ bin/sh/arith_yacc.c 2022-06-13 12:39:52.888785000 +0000 @@ -35,6 +35,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <ctype.h> #include <limits.h> #include <errno.h> #include <inttypes.h> @@ -92,6 +93,13 @@ /* NOTREACHED */ } +static inline int is_blank(const char *p) +{ + while (isspace((unsigned char)*p)) + p++; + return *p =3D=3D '\0'; +} + static arith_t arith_lookupvarint(char *varname) { const char *str; @@ -105,7 +113,7 @@ str =3D "0"; errno =3D 0; result =3D strtoarith_t(str, &p); - if (errno !=3D 0 || *p !=3D '\0') + if (errno !=3D 0 || !is_blank(p)) yyerror("variable conversion error"); return result; } ---END--- --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-264656-227-F1V1WJ6mE7>