From: Paul Smith <psmith@gnu.org>
Date: Sun, 2 Oct 2022 22:34:07 +0000 (-0400)
Subject: * src/arscan.c (ar_scan): Avoid sign comparison warnings
X-Git-Tag: 4.3.91~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca92d83cde6ce6c0c42c60d95c711d5334b76b20;p=thirdparty%2Fmake.git

* src/arscan.c (ar_scan): Avoid sign comparison warnings

Pacify 12.2.1 20220819 (Red Hat 12.2.1-2) -Wsign-compare by checking
the readbuf() return explicitly for errors then casting from ssize_t.
Initial patch provided by Paul Eggert <eggert@cs.ucla.edu>.
---

diff --git a/src/arscan.c b/src/arscan.c
index eb806a69..b7180ba2 100644
--- a/src/arscan.c
+++ b/src/arscan.c
@@ -716,12 +716,12 @@ ar_scan (const char *archive, ar_member_func_t function, const void *arg)
               const char* err;
               unsigned int name_len = make_toui (name + 3, &err);
 
-              if (err || name_len == 0 || name_len > PATH_MAX)
+              if (err || name_len == 0 || name_len >= MIN (PATH_MAX, INT_MAX))
                 goto invalid;
 
               name = alloca (name_len + 1);
               nread = readbuf (desc, name, name_len);
-              if (nread != name_len)
+              if (nread < 0 || (unsigned int) nread != name_len)
                 goto invalid;
 
               name[name_len] = '\0';