mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash with empty (or very short) dive list

Browse source 
In commit 37c10c8fd6 ("Add dive type to statistics window") not enough
space is reserved for the newly introduced array if the dive list as fewer
than 4 entries.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-01-18 11:44:05 -08:00
parent 403d6dcfb0
commit b2eee9db6b
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
statistics.c
View file

@ -101,7 +101,7 @@ void process_all_dives(struct dive *dive, struct dive **prev_dive)
int prev_month = 0, prev_year = 0; int prev_month = 0, prev_year = 0;
int trip_iter = 0; int trip_iter = 0;
dive_trip_t *trip_ptr = 0; dive_trip_t *trip_ptr = 0;
unsigned int size; unsigned int size, tsize;
*prev_dive = NULL; *prev_dive = NULL;
memset(&stats, 0, sizeof(stats)); memset(&stats, 0, sizeof(stats));
@ -121,16 +121,17 @@ void process_all_dives(struct dive *dive, struct dive **prev_dive)
free(stats_by_type); free(stats_by_type);
size = sizeof(stats_t) * (dive_table.nr + 1); size = sizeof(stats_t) * (dive_table.nr + 1);
tsize = sizeof(stats_t) * (NUM_DC_TYPE + 1);
stats_yearly = malloc(size); stats_yearly = malloc(size);
stats_monthly = malloc(size); stats_monthly = malloc(size);
stats_by_trip = malloc(size); stats_by_trip = malloc(size);
stats_by_type = malloc(size); stats_by_type = malloc(tsize);
if (!stats_yearly || !stats_monthly || !stats_by_trip || !stats_by_type) if (!stats_yearly || !stats_monthly || !stats_by_trip || !stats_by_type)
return; return;
memset(stats_yearly, 0, size); memset(stats_yearly, 0, size);
memset(stats_monthly, 0, size); memset(stats_monthly, 0, size);
memset(stats_by_trip, 0, size); memset(stats_by_trip, 0, size);
memset(stats_by_type, 0, size); memset(stats_by_type, 0, tsize);
stats_yearly[0].is_year = true; stats_yearly[0].is_year = true;
/* Setting the is_trip to true to show the location as first /* Setting the is_trip to true to show the location as first