thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: Improve thread-safety for icons set access

Browse source 
The previous commit was not sufficient as getIconsSet() returns a
reference to the SearchSet and it could then be used after the
mutex had been unlocked and while it was being modified in
initIconsSet() called in another thread.
This commit is contained in:
Thierry Crozat 2022-06-29 19:27:27 +01:00 • committed by Eugene Sandulenko
parent 9dd4da4e4d
commit f4bbbe5786
No known key found for this signature in database
GPG key ID: 014D387312D34F08
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gui/gui-manager.h
View file

@ -96,10 +96,9 @@ public:
ThemeEval *xmlEval() { return _theme->getEvaluator(); } ThemeEval *xmlEval() { return _theme->getEvaluator(); }
Common::SearchSet &getIconsSet() { void lockIconsSet() { _iconsMutex.lock(); }
Common::StackLock lock(_iconsMutex); void unlockIconsSet() { _iconsMutex.unlock(); }
return _iconsSet; Common::SearchSet &getIconsSet() { return _iconsSet; }
}
int16 getGUIWidth() const { return _baseWidth; } int16 getGUIWidth() const { return _baseWidth; }
int16 getGUIHeight() const { return _baseHeight; } int16 getGUIHeight() const { return _baseHeight; }

2
gui/launcher.cpp
View file

@ -183,6 +183,7 @@ LauncherDialog::LauncherDialog(const Common::String &dialogName, LauncherChooser
Common::ArchiveMemberList mdFiles; Common::ArchiveMemberList mdFiles;
g_gui.lockIconsSet();
g_gui.getIconsSet().listMatchingMembers(mdFiles, "*.xml"); g_gui.getIconsSet().listMatchingMembers(mdFiles, "*.xml");
for (Common::ArchiveMemberList::iterator md = mdFiles.begin(); md != mdFiles.end(); ++md) { for (Common::ArchiveMemberList::iterator md = mdFiles.begin(); md != mdFiles.end(); ++md) {
if (_metadataParser.loadStream((*md)->createReadStream()) == false) { if (_metadataParser.loadStream((*md)->createReadStream()) == false) {
@ -194,6 +195,7 @@ LauncherDialog::LauncherDialog(const Common::String &dialogName, LauncherChooser
} }
_metadataParser.close(); _metadataParser.close();
} }
g_gui.unlockIconsSet();
} }
LauncherDialog::~LauncherDialog() { LauncherDialog::~LauncherDialog() {

5
gui/widgets/grid.cpp
View file

@ -291,9 +291,11 @@ Graphics::ManagedSurface *loadSurfaceFromFile(const Common::String &name, int re
#ifdef USE_PNG #ifdef USE_PNG
const Graphics::Surface *srcSurface = nullptr; const Graphics::Surface *srcSurface = nullptr;
Image::PNGDecoder decoder; Image::PNGDecoder decoder;
g_gui.lockIconsSet();
if (g_gui.getIconsSet().hasFile(name)) { if (g_gui.getIconsSet().hasFile(name)) {
Common::SeekableReadStream *stream = g_gui.getIconsSet().createReadStreamForMember(name); Common::SeekableReadStream *stream = g_gui.getIconsSet().createReadStreamForMember(name);
if (!decoder.loadStream(*stream)) { if (!decoder.loadStream(*stream)) {
g_gui.unlockIconsSet();
warning("Error decoding PNG"); warning("Error decoding PNG");
return surf; return surf;
} }
@ -308,10 +310,12 @@ Graphics::ManagedSurface *loadSurfaceFromFile(const Common::String &name, int re
} else { } else {
debug(5, "GridWidget: Cannot read file '%s'", name.c_str()); debug(5, "GridWidget: Cannot read file '%s'", name.c_str());
} }
g_gui.unlockIconsSet();
#else #else
error("No PNG support compiled"); error("No PNG support compiled");
#endif #endif
} else if (name.hasSuffix(".svg")) { } else if (name.hasSuffix(".svg")) {
g_gui.lockIconsSet();
if (g_gui.getIconsSet().hasFile(name)) { if (g_gui.getIconsSet().hasFile(name)) {
Common::SeekableReadStream *stream = g_gui.getIconsSet().createReadStreamForMember(name); Common::SeekableReadStream *stream = g_gui.getIconsSet().createReadStreamForMember(name);
Graphics::SVGBitmap *image = nullptr; Graphics::SVGBitmap *image = nullptr;
@ -325,6 +329,7 @@ Graphics::ManagedSurface *loadSurfaceFromFile(const Common::String &name, int re
} else { } else {
debug(5, "GridWidget: Cannot read file '%s'", name.c_str()); debug(5, "GridWidget: Cannot read file '%s'", name.c_str());
} }
g_gui.unlockIconsSet();
} }
return surf; return surf;
} }