Remove INT_ADD_WRAPV bug workarounds

* src/alloc.c (free_cons):
* src/casefiddle.c (do_casify_multibyte_string):
* src/editfns.c (styled_format):
* src/image.c (png_load_body):
Remove recent workarounds for INT_ADD_WRAPV bugs since
the bugs have been fixed (Bug#37006).

1 files changed, 3 insertions, 5 deletions

diff --git a/src/image.c b/src/image.c
index b37851f0963..81d8cb4e2b2 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6463,6 +6463,7 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
   png_uint_32 row_bytes;
   bool transparent_p;
   struct png_memory_storage tbr;  /* Data to be read */
+  ptrdiff_t nbytes;
   Emacs_Pix_Container ximg, mask_img = NULL;
 
   /* Find out what file to load.  */
@@ -6658,13 +6659,10 @@ png_load_body (struct frame *f, struct image *img, struct png_load_context *c)
   /* Number of bytes needed for one row of the image.  */
   row_bytes = png_get_rowbytes (png_ptr, info_ptr);
 
-  /* Use a temporary signed variable, since otherwise
-     INT_MULTIPLY_WRAPV might incorrectly return non-zero.  */
-  ptrdiff_t nbytes = sizeof *pixels;
-  if (INT_MULTIPLY_WRAPV (row_bytes, nbytes, &nbytes)
+  /* Allocate memory for the image.  */
+  if (INT_MULTIPLY_WRAPV (row_bytes, sizeof *pixels, &nbytes)
       || INT_MULTIPLY_WRAPV (nbytes, height, &nbytes))
     memory_full (SIZE_MAX);
-  /* Allocate memory for the image.  */
   c->pixels = pixels = xmalloc (nbytes);
   c->rows = rows = xmalloc (height * sizeof *rows);
   for (i = 0; i < height; ++i)