From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 7105A3858419; Wed, 21 Feb 2024 18:54:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7105A3858419 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1708541670; bh=3A7CJrWpKYrAuHjL8iwoveq+N96Bx662y/xXeoCmZDE=; h=From:To:Subject:Date:From; b=bp1hxK6JQ9fowQzZ7FP1xPW9gf4GwcZCycge2WANFcaA8MgPPnH2xdlB+O/8t+zl/ W1fzs6/JuZ6tWjvoM+ngLvVmmZzTCBIcxB1JcffP0oDcZMfPwWDSjFMf9/adtMJJ3u WGO9jBTzwUD/g6YwhXDMHcYxFJWNvjMV6OZwpo+c= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: strptime: make sure to fail on invalid input digits X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: acf176104fc5410bfec0635ed2c5a21971b9c938 X-Git-Newrev: 343a2a558153318b37de5fa6afc2d656739f0eed Message-Id: <20240221185430.7105A3858419@sourceware.org> Date: Wed, 21 Feb 2024 18:54:30 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D343a2a55815= 3318b37de5fa6afc2d656739f0eed commit 343a2a558153318b37de5fa6afc2d656739f0eed Author: Corinna Vinschen AuthorDate: Wed Feb 21 19:39:37 2024 +0100 Commit: Corinna Vinschen CommitDate: Wed Feb 21 19:39:37 2024 +0100 Cygwin: strptime: make sure to fail on invalid input digits =20 conv_num returns NULL if the input is invalid, e. g., the numbers are out of range. However, the code fails to test this in a lot of places. =20 Rather than adding checks all over the place, rename conv_num to __conv_num and create a wrapper macro conv_num to perform the task of error checking. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/libc/strptime.cc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/libc/strptime.cc b/winsup/cygwin/libc/strptime.cc index dc557231012d..353b8008a1c9 100644 --- a/winsup/cygwin/libc/strptime.cc +++ b/winsup/cygwin/libc/strptime.cc @@ -301,10 +301,19 @@ first_day (int year) return ret; } =20 -/* This simplifies the calls to conv_num enormously. */ +/* This simplifies the calls to __conv_num enormously. */ #define ALT_DIGITS ((alt_format & ALT_O) ? *alt_digits : NULL) =20 -static const unsigned char *conv_num(const unsigned char *, int *, uint, u= int, +#define conv_num(_b,_d,_l,_u,_a) \ + ({ \ + const unsigned char *_ret; \ + _ret =3D __conv_num((_b),(_d),(_l),(_u),(_a)); \ + if (!_ret) \ + return NULL; \ + _ret; \ + }) + +static const unsigned char *__conv_num(const unsigned char *, int *, uint,= uint, alt_digits_t *); static const unsigned char *find_string(const unsigned char *, int *, const char * const *, @@ -842,7 +851,7 @@ strptime (const char *__restrict buf, const char *__res= trict fmt, } =20 static const unsigned char * -conv_num(const unsigned char *buf, int *dest, uint llim, uint ulim, +__conv_num(const unsigned char *buf, int *dest, uint llim, uint ulim, alt_digits_t *alt_digits) { uint result =3D 0;