martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/emacs.c (load_pdump): Fix use of xpalloc.

Browse Source
This commit is contained in:
Andreas Schwab
2022-10-02 12:15:27 +02:00
parent 7ff5207624
commit e5a49f44ff
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/emacs.c
View File

@@ -867,9 +867,8 @@ load_pdump (int argc, char **argv)
}
/* Where's our executable? */
ptrdiff_t bufsize, exec_bufsize;
emacs_executable = load_pdump_find_executable (argv[0], &bufsize);
exec_bufsize = bufsize;
ptrdiff_t exec_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. */
@@ -902,8 +901,8 @@ load_pdump (int argc, char **argv)
strip_suffix_length))
exenamelen = prefix_length;
}
ptrdiff_t needed = exenamelen + strlen (suffix) + 1;
dump_file = xpalloc (NULL, &bufsize, max (1, needed - bufsize), -1, 1);
ptrdiff_t bufsize = exenamelen + strlen (suffix) + 1;
dump_file = xpalloc (NULL, &bufsize, 1, -1, 1);
memcpy (dump_file, emacs_executable, exenamelen);
strcpy (dump_file + exenamelen, suffix);
result = pdumper_load (dump_file, emacs_executable);