diff options
author | Piotr Wierciński <piotr.wiercinski@qt.io> | 2024-02-29 16:53:07 +0100 |
---|---|---|
committer | Piotr Wierciński <piotr.wiercinski@qt.io> | 2024-03-18 09:31:42 +0000 |
commit | dbda7d2f8b68b32ff580fc386ad32d0cad459dbd (patch) | |
tree | a35838be920e6ffce3872234434f30d5272d1e2d | |
parent | 9888d8ee2272139c2d7d3088c7ada148661bc338 (diff) |
wasm: Dont access QNetworkReply header data through dangling pointer
Fixes: QTBUG-122893
Change-Id: I3768fdffaec7be4ec0b559fdb365600220e648d1
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
(cherry picked from commit a5b00cefef12999e9a213943855abe6bc0ab5365)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9a59f6bc574e3b9dfa09ac33e6dd951f105f87bb)
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_wasm_p.h | 2 | ||||
-rw-r--r-- | src/network/access/qnetworkreplywasmimpl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_wasm_p.h b/src/corelib/kernel/qeventdispatcher_wasm_p.h index 564bbffa47..09231e0d4c 100644 --- a/src/corelib/kernel/qeventdispatcher_wasm_p.h +++ b/src/corelib/kernel/qeventdispatcher_wasm_p.h @@ -53,6 +53,7 @@ public: void interrupt() override; void wakeUp() override; + static void runOnMainThread(std::function<void(void)> fn); static void runOnMainThreadAsync(std::function<void(void)> fn); static void socketSelect(int timeout, int socket, bool waitForRead, bool waitForWrite, bool *selectForRead, bool *selectForWrite, bool *socketDisconnect); @@ -89,7 +90,6 @@ private: bool *selectForRead, bool *selectForWrite, bool *socketDisconnect); static void run(std::function<void(void)> fn); - static void runOnMainThread(std::function<void(void)> fn); static void runAsync(std::function<void(void)> fn); static QEventDispatcherWasm *g_mainThreadEventDispatcher; diff --git a/src/network/access/qnetworkreplywasmimpl.cpp b/src/network/access/qnetworkreplywasmimpl.cpp index f7380a10d9..eb3e50dec8 100644 --- a/src/network/access/qnetworkreplywasmimpl.cpp +++ b/src/network/access/qnetworkreplywasmimpl.cpp @@ -297,7 +297,7 @@ void QNetworkReplyWasmImplPrivate::doSendRequest() attr.destinationPath = destinationPath.constData(); auto url = request.url().toString().toUtf8(); - QEventDispatcherWasm::runOnMainThreadAsync([attr, url]() mutable { + QEventDispatcherWasm::runOnMainThread([attr, url]() mutable { emscripten_fetch(&attr, url); }); state = Working; |