mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[smtk-import] avoid infinite loop on index failure

Browse source 
As Berthold points out, a failure to match the site or location index
will result in an infinite loop with previous patch.
With this one the loop will end after reading the last table row even if
no idx is matched. But ... If we asume this situation is possible the
retrieved data would be wrong, and ending the function without filling
the site structure is mandatory too.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
This commit is contained in:
Salvador Cuñat 2019-08-01 23:50:26 +02:00 committed by Robert C. Helling
parent 218567bb86
commit ac1408af5f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
smtk-import/smartrak.c
View file

@ -321,7 +321,7 @@ static void smtk_build_location(MdbHandle *mdb, char *idx, struct dive_site **lo
MdbTableDef *table;
MdbColumn *col[MDB_MAX_COLS];
char *bound_values[MDB_MAX_COLS];
int i;
int i, rc;
uint32_t d;
struct dive_site *ds;
location_t loc;
@ -333,10 +333,11 @@ static void smtk_build_location(MdbHandle *mdb, char *idx, struct dive_site **lo
table = smtk_open_table(mdb, "Site", col, bound_values);
if (!table)
return;
do {
mdb_fetch_row(table);
} while (strcasecmp(col[0]->bind_ptr, idx));
rc = mdb_fetch_row(table);
} while (strcasecmp(col[0]->bind_ptr, idx) && rc != 0);
if (rc == 0)
return;
loc_idx = copy_string(col[2]->bind_ptr);
site = copy_string(col[1]->bind_ptr);
loc = create_location(strtod(col[6]->bind_ptr, NULL), strtod(col[7]->bind_ptr, NULL));
@ -362,8 +363,10 @@ static void smtk_build_location(MdbHandle *mdb, char *idx, struct dive_site **lo
table = smtk_open_table(mdb, "Location", col, bound_values);
mdb_rewind_table(table);
do {
mdb_fetch_row(table);
} while (strcasecmp(col[0]->bind_ptr, loc_idx));
rc =mdb_fetch_row(table);
} while (strcasecmp(col[0]->bind_ptr, loc_idx) && rc != 0);
if (rc == 0)
return;
/*
* Create a string for Subsurface's dive site structure with coordinates