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

Import: fix infinite loop

Browse source 
Owing to a variable reuse in a nested loop, importing dive logs
with new trips could lead to an infinite loop. Use a fresh index "j".

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-03-03 14:56:38 +01:00 • committed by Dirk Hohndel
parent e4a1991e0c
commit 9b5f6e16e1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/divelist.c
View file

@ -1673,7 +1673,7 @@ void process_imported_dives(struct dive_table *import_table, struct trip_table *
struct dive_table *dives_to_add, struct dive_table *dives_to_remove, struct dive_table *dives_to_add, struct dive_table *dives_to_remove,
struct trip_table *trips_to_add) struct trip_table *trips_to_add)
{ {
int i, nr, start_renumbering_at = 0; int i, j, nr, start_renumbering_at = 0;
struct dive_trip *trip_import, *new_trip; struct dive_trip *trip_import, *new_trip;
int preexisting; int preexisting;
bool sequence_changed = false; bool sequence_changed = false;
@ -1740,8 +1740,8 @@ void process_imported_dives(struct dive_table *import_table, struct trip_table *
/* If no trip to merge-into was found, add trip as-is. /* If no trip to merge-into was found, add trip as-is.
* First, add dives to list of dives to add */ * First, add dives to list of dives to add */
for (i = 0; i < trip_import->dives.nr; i++) { for (j = 0; j < trip_import->dives.nr; j++) {
struct dive *d = trip_import->dives.dives[i]; struct dive *d = trip_import->dives.dives[j];
/* Add dive to list of dives to-be-added. */ /* Add dive to list of dives to-be-added. */
insert_dive(dives_to_add, d); insert_dive(dives_to_add, d);