noham/archived-Reclass
1
0
Fork 0
mirror of https://github.com/NohamR/Reclass.git synced 2026-05-10 19:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MCP use-after-free, scanner chunk overlap, build scripts

Browse Source 
- MCP bridge: guard against use-after-free when client disconnects
  during sendJson flush by re-checking m_client after write
- Scanner engine: fix chunk overlap advancing past region end on
  final chunk; fix fallback region flags for providers without
  enumerateRegions
- Build scripts: prefer GCC MinGW over LLVM-MinGW in PATH detection
This commit is contained in:
noita-player
2026-03-08 20:00:50 -07:00
parent a21e5a07a8
commit 7b9b140823
5 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mcp/mcp_bridge.cpp
View File

@@ -45,9 +45,13 @@ void McpBridge::start() {
void McpBridge::stop() {
if (m_client) {
m_client->disconnect(this);
m_client->disconnectFromServer();
m_client->deleteLater();
m_client = nullptr;
}
m_readBuffer.clear();
m_initialized = false;
if (m_server) {
m_server->close();
delete m_server;
@@ -65,8 +69,10 @@ void McpBridge::onNewConnection() {
// Single client — disconnect previous
if (m_client) {
m_client->disconnect(this);
m_client->disconnectFromServer();
m_client->deleteLater();
m_client = nullptr;
}
m_client = pending;
@@ -82,10 +88,13 @@ void McpBridge::onNewConnection() {
}
void McpBridge::onReadyRead() {
if (!m_client) return;
m_readBuffer.append(m_client->readAll());
// Newline-delimited JSON framing
while (true) {
// Guard: processLine→sendJson→flush can re-enter the event loop
// and trigger onDisconnected, nulling m_client mid-loop.
while (m_client) {
int idx = m_readBuffer.indexOf('\n');
if (idx < 0) break;
QByteArray line = m_readBuffer.left(idx).trimmed();
@@ -97,7 +106,12 @@ void McpBridge::onReadyRead() {
void McpBridge::onDisconnected() {
qDebug() << "[MCP] Client disconnected";
m_client = nullptr;
if (m_client) {
m_client->disconnect(this);
m_client->deleteLater();
m_client = nullptr;
}
m_readBuffer.clear();
m_initialized = false;
}
@@ -127,7 +141,7 @@ void McpBridge::sendJson(const QJsonObject& obj) {
qDebug() << "[MCP] >>" << data.left(200);
data.append('\n');
m_client->write(data);
m_client->flush();
if (m_client) m_client->flush();
}
void McpBridge::sendNotification(const QString& method, const QJsonObject& params) {
@@ -172,12 +186,10 @@ void McpBridge::processLine(const QByteArray& line) {
if (method == "initialize") {
m_mainWindow->setMcpStatus(QStringLiteral("MCP: client connected"));
QCoreApplication::processEvents();
sendJson(handleInitialize(id, req.value("params").toObject()));
m_mainWindow->clearMcpStatus();
} else if (method == "tools/list") {
m_mainWindow->setMcpStatus(QStringLiteral("MCP: tools/list"));
QCoreApplication::processEvents();
sendJson(handleToolsList(id));
m_mainWindow->clearMcpStatus();
} else if (method == "tools/call") {