mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 13:36:15 +02:00
Code

progress: don't dereference before checking for NULL 

In `stop_progress()`, we're careful to check that `p_progress` is
non-NULL before we dereference it, but by then we have already
dereferenced it when calling `finish_if_sparse(*p_progress)`. And, for
what it's worth, we'll go on to blindly dereference it again inside
`stop_progress_msg()`.

We could return early if we get a NULL-pointer, but let's go one step
further and BUG instead. The progress API handles NULL just fine, but
that's the NULL-ness of `*p_progress`, e.g., when running with
`--no-progress`. If `p_progress` is NULL, chances are that's a mistake.
For symmetry, let's do the same check in `stop_progress_msg()`, too.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin Ågren 2020-08-10 21:47:48 +02:00 committed by Junio C Hamano
parent 98a1364740
commit ac900fddb7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
progress.c
View File

@ -319,9 +319,12 @@ static void finish_if_sparse(struct progress *progress)
void stop_progress(struct progress **p_progress) void stop_progress(struct progress **p_progress)
{ {
if (!p_progress)
BUG("don't provide NULL to stop_progress");
finish_if_sparse(*p_progress); finish_if_sparse(*p_progress);
if (p_progress && *p_progress) { if (*p_progress) {
trace2_data_intmax("progress", the_repository, "total_objects", trace2_data_intmax("progress", the_repository, "total_objects",
(*p_progress)->total); (*p_progress)->total);
@ -342,7 +345,12 @@ void stop_progress(struct progress **p_progress)
void stop_progress_msg(struct progress **p_progress, const char *msg) void stop_progress_msg(struct progress **p_progress, const char *msg)
{ {
struct progress *progress = *p_progress; struct progress *progress;
if (!p_progress)
BUG("don't provide NULL to stop_progress_msg");
progress = *p_progress;
if (!progress) if (!progress)
return; return;
*p_progress = NULL; *p_progress = NULL;