From: Andreas Schwab <schwab@linux-m68k.org>
Date: Tue, 4 Oct 2022 16:22:58 +0000 (+0200)
Subject: * src/emacs.c (load_pdump): Propery handle case when executable
X-Git-Tag: emacs-28.3-rc1~40
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a78af3018e;p=emacs.git

* src/emacs.c (load_pdump): Propery handle case when executable
wasn't found.
---

diff --git a/src/emacs.c b/src/emacs.c
index 92779a8d0de..a8af288bf09 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -867,13 +867,17 @@ load_pdump (int argc, char **argv)
     }
 
   /* Where's our executable?  */
-  ptrdiff_t exec_bufsize, needed;
+  ptrdiff_t exec_bufsize, bufsize, needed;
   emacs_executable = load_pdump_find_executable (argv[0], &exec_bufsize);
 
   /* If we couldn't find our executable, go straight to looking for
      the dump in the hardcoded location.  */
   if (!(emacs_executable && *emacs_executable))
-    goto hardcoded;
+    {
+      bufsize = 0;
+      dump_file = NULL;
+      goto hardcoded;
+    }
 
   if (dump_file)
     {
@@ -901,7 +905,7 @@ load_pdump (int argc, char **argv)
 		      strip_suffix_length))
 	exenamelen = prefix_length;
     }
-  ptrdiff_t bufsize = exenamelen + strlen (suffix) + 1;
+  bufsize = exenamelen + strlen (suffix) + 1;
   dump_file = xpalloc (NULL, &bufsize, 1, -1, 1);
   memcpy (dump_file, emacs_executable, exenamelen);
   strcpy (dump_file + exenamelen, suffix);