Skip to content

DPL: fix small leak when receiving WS messages from the driver #13871

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
ktf merged 2 commits into from
Jan 17, 2025
Merged

DPL: fix small leak when receiving WS messages from the driver #13871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9315c9e
DPL: fix leak on failure to parse messages
ktf Jan 17, 2025
865586f
DPL: fix small leak when receiving WS messages from the driver
ktf Jan 17, 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
9 changes: 5 additions & 4 deletions Framework/Core/src/DPLWebSocket.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ struct GUIWebSocketHandler : public WebSocketHandler {
}
}
}
void endFragmentation() override{};
void control(char const* frame, size_t s) override{};
void beginChunk() override{};
void endChunk() override{};
void endFragmentation() override {};
void control(char const* frame, size_t s) override {};
void beginChunk() override {};
void endChunk() override {};

/// The driver context were we want to accumulate changes
/// which we got from the websocket.
Expand Down Expand Up @@ -415,6 +415,7 @@ void websocket_client_callback(uv_stream_t* stream, ssize_t nread, const uv_buf_
try {
LOG(debug) << "Data received from server";
parse_http_request(buf->base, nread, context->client);
free(buf->base);
} catch (RuntimeErrorRef& ref) {
auto& err = o2::framework::error_from_ref(ref);
LOG(error) << "Error while parsing request: " << err.what;
Expand Down
1 change: 1 addition & 0 deletions Framework/Core/src/runDataProcessing.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,7 @@ void websocket_callback(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf)
} catch (WSError& e) {
LOG(error) << "Error while parsing request: " << e.message;
handler->error(e.code, e.message.c_str());
free(buf->base);
}
}

Expand Down
Loading