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

Cloud storage: fix potential crash when avoiding reloading dive list

Browse source 
If we loaded the dive list from cache and then try to figure out if the remote
repository had anything different, we were being super stupid if the SHA was
identical... we had already cleared the dive list by the time we decided that
we didn't need to load things. Granted, the model was still populated (oops),
but the backend data structure was cleared and accesses to it (e.g., when
drawing the profile) would cause things to crash.

The helper function duplicates some code, but trying to not duplicate the code
made things even harder to read.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-01-04 17:48:34 -08:00
parent 72ce77a5ee
commit 3bfa8de2f7
3 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
qt-mobile/qmlmanager.cpp
View file

@ -267,18 +267,16 @@ void QMLManager::loadDivesWithValidCredentials()
setStartPageText(tr("Cloud storage error: %1").arg(errorString));
return;
}
clear_dive_file_data();
QByteArray fileNamePrt = QFile::encodeName(url);
QString savedSHA(saved_git_id);
int error = parse_file(fileNamePrt.data());
if (savedSHA == saved_git_id) {
if (check_git_sha(fileNamePrt.data()) == 0) {
qDebug() << "local cache was current, no need to modify dive list";
appendTextToLog("Cloud sync shows local cache was current");
return;
}
qDebug() << "had" << savedSHA << "got" << saved_git_id << ", so let's reload";
clear_dive_file_data();
DiveListModel::instance()->clear();
int error = parse_file(fileNamePrt.data());
if (!error) {
report_error("filename is now %s", fileNamePrt.data());
const char *error_string = get_error_string();
@ -296,7 +294,6 @@ void QMLManager::loadDivesWithValidCredentials()
int i;
struct dive *d;
DiveListModel::instance()->clear();
for_each_dive(i, d) {
DiveListModel::instance()->addDive(d);
}

1
subsurface-core/dive.h
View file

@ -660,6 +660,7 @@ extern int parse_cobalt_buffer(sqlite3 *handle, const char *url, const char *buf
extern int parse_divinglog_buffer(sqlite3 *handle, const char *url, const char *buf, int size, struct dive_table *table);
extern int parse_dlf_buffer(unsigned char *buffer, size_t size);
extern int check_git_sha(const char *filename);
extern int parse_file(const char *filename);
extern int parse_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate);
extern int parse_seabear_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate);

27
subsurface-core/file.c
View file

@ -432,6 +432,33 @@ static int parse_file_buffer(const char *filename, struct memblock *mem)
return parse_xml_buffer(filename, mem->buffer, mem->size, &dive_table, NULL);
}
int check_git_sha(const char *filename)
{
struct git_repository *git;
const char *branch = NULL;
git = is_git_repository(filename, &branch, NULL, false);
if (prefs.cloud_git_url &&
strstr(filename, prefs.cloud_git_url)
&& git == dummy_git_repository)
/* opening the cloud storage repository failed for some reason,
* so we don't know if there is additional data in the remote */
return 1;
/* if this is a git repository, do we already have this exact state loaded ?
* get the SHA and compare with what we currently have */
if (git && git != dummy_git_repository) {
const char *sha = get_sha(git, branch);
if (!same_string(sha, "") &&
same_string(sha, saved_git_id) &&
!unsaved_changes()) {
fprintf(stderr, "already have loaded SHA %s - don't load again\n", sha);
return 0;
}
}
return 1;
}
int parse_file(const char *filename)
{
struct git_repository *git;