kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ma/stop-progress-null-fix' 

NULL dereference fix.

* ma/stop-progress-null-fix:
  progress: don't dereference before checking for NULL
maint
Junio C Hamano 2020-08-17 17:02:48 -07:00
parent 07f14d31ab ac900fddb7
commit e6ec620d8b
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);


@ -338,7 +341,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;