[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 a78af3018e: * src/emacs.c (load_pdump): Propery handle case whe
From: |
Andreas Schwab |
Subject: |
emacs-28 a78af3018e: * src/emacs.c (load_pdump): Propery handle case when executable |
Date: |
Tue, 4 Oct 2022 12:33:48 -0400 (EDT) |
branch: emacs-28
commit a78af3018e30394137b07d94e3b763674a233afc
Author: Andreas Schwab <schwab@linux-m68k.org>
Commit: Andreas Schwab <schwab@linux-m68k.org>
* src/emacs.c (load_pdump): Propery handle case when executable
wasn't found.
---
src/emacs.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/emacs.c b/src/emacs.c
index 92779a8d0d..a8af288bf0 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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 a78af3018e: * src/emacs.c (load_pdump): Propery handle case when executable,
Andreas Schwab <=