Skip to content

Fix INVALID_PARAMETER crash in ThreadPoolSchedulerWin::Post by adding null handle checks #15150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2025
+20 −4
Merged

Fix INVALID_PARAMETER crash in ThreadPoolSchedulerWin::Post by adding null handle checks #15150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a0c83d
fix for watson
Oct 7, 2025
9d38e8e
Change files
Oct 7, 2025
1612705
Merge branch 'main' into copilot/fix-15099
HariniMalothu17 Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/react-native-windows-430100b8-4f19-4354-90b8-48658475a668.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix for watson",
"packageName": "react-native-windows",
"email": "hmalothu@microsoft.com",
"dependentChangeType": "patch"
}
17 changes: 13 additions & 4 deletions vnext/Mso/src/dispatchQueue/threadPoolScheduler_win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

#include <stdexcept> // For std::runtime_error
#include <utility>
#include "dispatchQueue/dispatchQueue.h"
#include "queueService.h"
Expand All @@ -14,7 +15,7 @@ struct ThreadPoolWorkDeleter {
};

struct ThreadPoolSchedulerWin : Mso::UnknownObject<IDispatchQueueScheduler> {
ThreadPoolSchedulerWin(uint32_t maxThreads) noexcept;
ThreadPoolSchedulerWin(uint32_t maxThreads);
~ThreadPoolSchedulerWin() noexcept override;

static void __stdcall WorkCallback(
Expand Down Expand Up @@ -93,9 +94,17 @@ std::mutex ThreadPoolSchedulerWin::s_threadPoolWorkMutex;
bool ThreadPoolSchedulerWin::s_enableThreadPoolWorkTracking{false};
std::vector<std::shared_ptr<TP_WORK>> ThreadPoolSchedulerWin::s_trackedThreadPoolWork;

ThreadPoolSchedulerWin::ThreadPoolSchedulerWin(uint32_t maxThreads) noexcept
: m_threadPoolWork{::CreateThreadpoolWork(WorkCallback, this, nullptr), ThreadPoolWorkDeleter{}},
m_maxThreads{maxThreads == 0 ? MaxConcurrentThreads : maxThreads} {
ThreadPoolSchedulerWin::ThreadPoolSchedulerWin(uint32_t maxThreads)
: m_maxThreads{maxThreads == 0 ? MaxConcurrentThreads : maxThreads} {
// Create thread pool work
TP_WORK *tpWork = ::CreateThreadpoolWork(WorkCallback, this, nullptr);

// Throw immediately if creation failed
if (!tpWork) {
throw std::runtime_error("Failed to create thread pool work");
}

m_threadPoolWork = std::shared_ptr<TP_WORK>(tpWork, ThreadPoolWorkDeleter{});
TrackThreadPoolWork(m_threadPoolWork);
}

Expand Down
Loading