From: Stefan Kangas <stefankangas@gmail.com>
To: emacs-devel@gnu.org, Andreas Schwab <schwab@linux-m68k.org>
Subject: Re: emacs-28 e5a49f44ff: * src/emacs.c (load_pdump): Fix use of xpalloc.
Date: Tue, 4 Oct 2022 15:25:59 +0200 [thread overview]
Message-ID: <CADwFkmkfvRex3awT5OMGU2gfw-2cCZhsVyVNLiZFEoGSozGOLw@mail.gmail.com> (raw)
In-Reply-To: <20221002103444.EE880C1AB4B@vcs2.savannah.gnu.org>
Andreas Schwab <schwab@gnu.org> writes:
> diff --git a/src/emacs.c b/src/emacs.c
> index 602fa802e0..92779a8d0d 100644
> --- a/src/emacs.c
> +++ b/src/emacs.c
> @@ -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);
This change leads to the below on macOS 10.13, using Apple LLVM
version 10.0.0 (clang-1000.10.44.4):
emacs.c:899:7: warning: variable 'bufsize' is used uninitialized
whenever 'if' condition is true [-Wsometimes-uninitialized]
if (!(emacs_executable && *emacs_executable))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
emacs.c:964:7: note: uninitialized use occurs here
if (bufsize < needed)
^~~~~~~
emacs.c:899:3: note: remove the 'if' if its condition is always false
if (!(emacs_executable && *emacs_executable))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
emacs.c:928:3: note: variable 'bufsize' is declared here
ptrdiff_t bufsize = exenamelen + strlen (suffix) + 1;
^
1 warning generated.
next parent reply other threads:[~2022-10-04 13:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <166470688469.7534.2087297540131700063@vcs2.savannah.gnu.org>
[not found] ` <20221002103444.EE880C1AB4B@vcs2.savannah.gnu.org>
2022-10-04 13:25 ` Stefan Kangas [this message]
2022-10-04 16:34 ` emacs-28 e5a49f44ff: * src/emacs.c (load_pdump): Fix use of xpalloc Andreas Schwab
2022-10-04 18:58 ` Stefan Kangas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CADwFkmkfvRex3awT5OMGU2gfw-2cCZhsVyVNLiZFEoGSozGOLw@mail.gmail.com \
--to=stefankangas@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.