From 5f7b771c4f455c82cb6d60a1d592471bc1ddd121 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 2 Jun 2020 14:11:17 +0200 Subject: [PATCH] Add missing lock in QFactoryLoader libraryList is modified in a code section that was not yet properly locked. This was overlooked by 7ca66b1e66e73a0cb35705df04507ef9f3440cab. Task-number: QTBUG-42855 Change-Id: I028ad21a7df314133931f860ad49453bb2db9da0 Pick-to: 5.15 Reviewed-by: Volker Hilsheimer --- src/corelib/plugin/qfactoryloader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index b03ab4349b..582f48e93e 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -296,6 +296,7 @@ void QFactoryLoader::update() } if (keyUsageCount || keys.isEmpty()) { library->setLoadHints(QLibrary::PreventUnloadHint); // once loaded, don't unload + QMutexLocker locker(&d->mutex); d->libraryList += library; } else { library->release();