From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 2 Oct 2022 09:58:04 +0000 (+0300)
Subject: Avoid assertion violation in 'xpalloc'
X-Git-Tag: emacs-28.3-rc1~46
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ff520762468b5de4684e4a3d8f0103c8f3bec64;p=emacs.git

Avoid assertion violation in 'xpalloc'

* src/emacs.c (load_pdump): Ensure the 3rd argument of xpalloc is
always positive.  (Bug#58232)
---

diff --git a/src/emacs.c b/src/emacs.c
index 0a90b0913be..602fa802e0b 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -903,7 +903,7 @@ load_pdump (int argc, char **argv)
 	exenamelen = prefix_length;
     }
   ptrdiff_t needed = exenamelen + strlen (suffix) + 1;
-  dump_file = xpalloc (NULL, &bufsize, needed - bufsize, -1, 1);
+  dump_file = xpalloc (NULL, &bufsize, max (1, needed - bufsize), -1, 1);
   memcpy (dump_file, emacs_executable, exenamelen);
   strcpy (dump_file + exenamelen, suffix);
   result = pdumper_load (dump_file, emacs_executable);