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

Protect writing to image hashes with a mutex

Browse source 
Hopefully...

Fixes #861

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2015-03-25 14:28:36 +01:00 • committed by Dirk Hohndel
parent 03fc9e3c26
commit 57192063c4
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qthelper.cpp
View file

@ -805,6 +805,7 @@ extern "C" void reverseGeoLookup(degrees_t latitude, degrees_t longitude, uint32
} }
QHash<QString, QByteArray> hashOf; QHash<QString, QByteArray> hashOf;
QMutex hashOfMutex;
QHash<QByteArray, QString> localFilenameOf; QHash<QByteArray, QString> localFilenameOf;
extern "C" char * hashstring(char * filename) extern "C" char * hashstring(char * filename)
@ -836,6 +837,7 @@ void write_hashes()
void add_hash(const QString filename, QByteArray hash) void add_hash(const QString filename, QByteArray hash)
{ {
QMutexLocker locker(&hashOfMutex);
hashOf[filename] = hash; hashOf[filename] = hash;
localFilenameOf[hash] = filename; localFilenameOf[hash] = filename;
} }
@ -853,6 +855,7 @@ QByteArray hashFile(const QString filename)
void learnHash(struct picture *picture, QByteArray hash) void learnHash(struct picture *picture, QByteArray hash)
{ {
free(picture->hash); free(picture->hash);
QMutexLocker locker(&hashOfMutex);
hashOf[QString(picture->filename)] = hash; hashOf[QString(picture->filename)] = hash;
picture->hash = strdup(hash.toHex()); picture->hash = strdup(hash.toHex());
} }
@ -869,6 +872,7 @@ QString fileFromHash(char *hash)
void updateHash(struct picture *picture) { void updateHash(struct picture *picture) {
QByteArray hash = hashFile(fileFromHash(picture->hash)); QByteArray hash = hashFile(fileFromHash(picture->hash));
QMutexLocker locker(&hashOfMutex);
hashOf[QString(picture->filename)] = hash; hashOf[QString(picture->filename)] = hash;
char *old = picture->hash; char *old = picture->hash;
picture->hash = strdup(hash.toHex()); picture->hash = strdup(hash.toHex());