From 23b50d60e34e324cf6f420c05293f7fa8a909623 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 13 May 2020 14:43:53 -0400 Subject: Avoid depending on side effects in assert(...) expressions When building with -DNDEBUG, assert statements are compiled out to no-ops. Thus, we can't depend on assignments or other computations occurring inside the assert(). Signed-off-by: Allan McRae --- src/pacman/callback.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 25909e02..4240a779 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -862,12 +862,14 @@ static void dload_progress_event(const char *filename, alpm_download_event_progr int64_t curr_time = get_time_ms(); double last_chunk_rate; int64_t timediff; + bool ok; if(!dload_progressbar_enabled()) { return; } - assert(find_bar_for_filename(filename, &index, &bar)); + ok = find_bar_for_filename(filename, &index, &bar); + assert(ok); /* compute current average values */ timediff = curr_time - bar->sync_time; @@ -902,12 +904,14 @@ static void dload_complete_event(const char *filename, alpm_download_event_compl int index; struct pacman_progress_bar *bar; int64_t timediff; + bool ok; if(!dload_progressbar_enabled()) { return; } - assert(find_bar_for_filename(filename, &index, &bar)); + ok = find_bar_for_filename(filename, &index, &bar); + assert(ok); bar->completed = true; /* This may not have been initialized if the download finished before -- cgit v1.2.3-70-g09d2