From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2134) id 593C93858428; Wed, 31 Aug 2022 19:19:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 593C93858428 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1661973561; bh=577f989Vg18G7gwa7wY5HZ+pUCksb+r5R8CW/g3hgfM=; h=From:To:Subject:Date:From; b=KIJZmqR7C9YHCl2bnvF9IVmbj4e4h35hf3BB35smJaiKHtctOCebwJMLnVXnNclWl VLtbzx8ZmPyGV0ug19TsGLO0//CrOzhM9W4IkZd6RaTS25Ghy2r9e02x6gFYN6q5qj /AOjjJyEQ+F+1AJWtb0BAqBBNVQzJLYfrXvNcUck= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jeff Johnston To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Fix some Coverity Scan errors. X-Act-Checkin: newlib-cygwin X-Git-Author: Jeff Johnston X-Git-Refname: refs/heads/master X-Git-Oldrev: dd1122e21cb4ea78ce4c5894787c8f085469f9dd X-Git-Newrev: d92d3a3c4a7af1ebe56d58c32986ab410f6071ec Message-Id: <20220831191921.593C93858428@sourceware.org> Date: Wed, 31 Aug 2022 19:19:21 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dd92d3a3c4a7= af1ebe56d58c32986ab410f6071ec commit d92d3a3c4a7af1ebe56d58c32986ab410f6071ec Author: Jeff Johnston Date: Wed Aug 31 15:18:08 2022 -0400 Fix some Coverity Scan errors. Diff: --- newlib/libc/posix/sleep.c | 3 ++- newlib/libc/posix/usleep.c | 1 - newlib/libc/stdio/swscanf.c | 2 ++ newlib/libc/stdio/vswscanf.c | 2 ++ newlib/libc/stdlib/arc4random.c | 2 ++ newlib/libc/time/time.c | 2 ++ 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/newlib/libc/posix/sleep.c b/newlib/libc/posix/sleep.c index f7c780ef0..0d6cd710d 100644 --- a/newlib/libc/posix/sleep.c +++ b/newlib/libc/posix/sleep.c @@ -7,6 +7,7 @@ #include #include #include +#include =20 unsigned sleep(unsigned seconds) { @@ -15,7 +16,7 @@ unsigned sleep(unsigned seconds) ts.tv_sec =3D seconds; ts.tv_nsec =3D 0; if (!nanosleep(&ts,&ts)) return 0; - if (errno =3D=3D EINTR) return ts.tv_sec; + if (errno =3D=3D EINTR) return ts.tv_sec & UINT_MAX; return -1; } =20 diff --git a/newlib/libc/posix/usleep.c b/newlib/libc/posix/usleep.c index 9322b6551..cc1b31408 100644 --- a/newlib/libc/posix/usleep.c +++ b/newlib/libc/posix/usleep.c @@ -15,7 +15,6 @@ int usleep(useconds_t useconds) ts.tv_sec =3D (long int)useconds / 1000000; ts.tv_nsec =3D ((long int)useconds % 1000000) * 1000; if (!nanosleep(&ts,&ts)) return 0; - if (errno =3D=3D EINTR) return ts.tv_sec; return -1; } =20 diff --git a/newlib/libc/stdio/swscanf.c b/newlib/libc/stdio/swscanf.c index 5514e68c0..578ac3c93 100644 --- a/newlib/libc/stdio/swscanf.c +++ b/newlib/libc/stdio/swscanf.c @@ -427,6 +427,8 @@ swscanf (const wchar_t *__restrict str, const wchar_t *= __restrict fmt, ...) f._read =3D __seofread; f._ub._base =3D NULL; f._lb._base =3D NULL; + f._flags2 =3D 0; + f._ur =3D 0; f._file =3D -1; /* No file. */ va_start (ap, fmt); ret =3D __ssvfwscanf_r (_REENT, &f, fmt, ap); diff --git a/newlib/libc/stdio/vswscanf.c b/newlib/libc/stdio/vswscanf.c index 13b61f4a3..415c98b0f 100644 --- a/newlib/libc/stdio/vswscanf.c +++ b/newlib/libc/stdio/vswscanf.c @@ -53,6 +53,8 @@ _vswscanf_r (struct _reent *ptr, const wchar_t *str, cons= t wchar_t *fmt, f._read =3D __seofread; f._ub._base =3D NULL; f._lb._base =3D NULL; + f._flags2 =3D 0; + f._ur =3D 0; f._file =3D -1; /* No file. */ return __ssvfwscanf_r (ptr, &f, fmt, ap); } diff --git a/newlib/libc/stdlib/arc4random.c b/newlib/libc/stdlib/arc4rando= m.c index 5860d644a..7bd9e7c5e 100644 --- a/newlib/libc/stdlib/arc4random.c +++ b/newlib/libc/stdlib/arc4random.c @@ -86,6 +86,8 @@ _rs_stir(void) { u_char rnd[KEYSZ + IVSZ]; =20 + memset(rnd, 0, (KEYSZ + IVSZ) * sizeof(u_char)); + if (getentropy(rnd, sizeof rnd) =3D=3D -1) _getentropy_fail(); =20 diff --git a/newlib/libc/time/time.c b/newlib/libc/time/time.c index 93e061b83..b431f7ae5 100644 --- a/newlib/libc/time/time.c +++ b/newlib/libc/time/time.c @@ -37,6 +37,8 @@ time (time_t * t) { struct timeval now; =20 + now.tv_sec =3D (time_t) -1; + if (_gettimeofday_r (_REENT, &now, NULL) < 0) now.tv_sec =3D (time_t) -1;