From: Paul Eggert Date: Tue, 27 Apr 2021 01:02:16 +0000 (-0700) Subject: build: update gnulib submodule to latest X-Git-Tag: v9.0~118 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fcf8c64876356e8fe449224b9dea64b43a8146c;p=thirdparty%2Fcoreutils.git build: update gnulib submodule to latest * src/csplit.c (load_buffer): * src/pinky.c (create_fullname): Use intprops-based checks rather than xalloc_oversized, since Gnulib xalloc.h no longer includes xalloc-oversized.h. --- diff --git a/gnulib b/gnulib index e54b645fc6..354b9691ac 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit e54b645fc6b8422562327443bda575c65d931fbd +Subproject commit 354b9691accd00a531358b652689ce7f580fbe54 diff --git a/src/csplit.c b/src/csplit.c index ee9aa65032..79bd034e3f 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -518,9 +518,8 @@ load_buffer (void) if (lines_found || have_read_eof) break; - if (xalloc_oversized (2, b->bytes_alloc)) + if (INT_MULTIPLY_WRAPV (b->bytes_alloc, 2, &bytes_wanted)) xalloc_die (); - bytes_wanted = 2 * b->bytes_alloc; free_buffer (b); free (b); } diff --git a/src/pinky.c b/src/pinky.c index 23a43f5e4f..6fea94923c 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -110,9 +110,9 @@ create_fullname (char const *gecos_name, char const *user_name) if (ampersands != 0) { size_t ulen = strlen (user_name); - size_t product = ampersands * ulen; - rsize += product - ampersands; - if (xalloc_oversized (ulen, ampersands) || rsize < product) + size_t product; + if (INT_MULTIPLY_WRAPV (ulen, ampersands - 1, &product) + || INT_ADD_WRAPV (rsize, product, &rsize)) xalloc_die (); }