mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 22:15:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

ownSql: Don't allow copying of SqlQuery

Browse source 
This fixes a crash on OS X where the destructor
calls sqlite3 to invalidate the underlying handle.
This commit is contained in:
Markus Goetz 2014-10-16 15:10:25 +02:00
parent 36eaff92e5
commit dbad1a8d45
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mirall/ownsql.h
View file

@ -43,6 +43,7 @@ private:
class SqlQuery class SqlQuery
{ {
Q_DISABLE_COPY(SqlQuery)
public: public:
explicit SqlQuery(); explicit SqlQuery();
explicit SqlQuery(SqlDatabase db); explicit SqlQuery(SqlDatabase db);

4
src/mirall/syncjournaldb.cpp
View file

@ -605,7 +605,7 @@ int SyncJournalDb::getFileRecordCount()
return 0; return 0;
} }
static void toDownloadInfo(SqlQuery query, SyncJournalDb::DownloadInfo * res) static void toDownloadInfo(SqlQuery &query, SyncJournalDb::DownloadInfo * res)
{ {
bool ok = true; bool ok = true;
res->_tmpfile = query.stringValue(0); res->_tmpfile = query.stringValue(0);
@ -651,6 +651,8 @@ SyncJournalDb::DownloadInfo SyncJournalDb::getDownloadInfo(const QString& file)
if( _getDownloadInfoQuery->next() ) { if( _getDownloadInfoQuery->next() ) {
toDownloadInfo(*_getDownloadInfoQuery, &res); toDownloadInfo(*_getDownloadInfoQuery, &res);
} else {
res._valid = false;
} }
_getDownloadInfoQuery->reset(); _getDownloadInfoQuery->reset();
} }