Skip to content

Commit dc3ccec

Browse files
authored
Merge 865586f into sapling-pr-archive-ktf
2 parents d62289a + 865586f commit dc3ccec

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

Framework/Core/src/DPLWebSocket.cxx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ struct GUIWebSocketHandler : public WebSocketHandler {
167167
}
168168
}
169169
}
170-
void endFragmentation() override{};
171-
void control(char const* frame, size_t s) override{};
172-
void beginChunk() override{};
173-
void endChunk() override{};
170+
void endFragmentation() override {};
171+
void control(char const* frame, size_t s) override {};
172+
void beginChunk() override {};
173+
void endChunk() override {};
174174

175175
/// The driver context were we want to accumulate changes
176176
/// which we got from the websocket.
@@ -415,6 +415,7 @@ void websocket_client_callback(uv_stream_t* stream, ssize_t nread, const uv_buf_
415415
try {
416416
LOG(debug) << "Data received from server";
417417
parse_http_request(buf->base, nread, context->client);
418+
free(buf->base);
418419
} catch (RuntimeErrorRef& ref) {
419420
auto& err = o2::framework::error_from_ref(ref);
420421
LOG(error) << "Error while parsing request: " << err.what;

Framework/Core/src/Expressions.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ size_t Filter::designateSubtrees(Node* node, size_t index)
6767
path.emplace(node, 0);
6868

6969
while (!path.empty()) {
70-
auto& top = path.top();
70+
auto top = path.top();
7171
top.node_ptr->index = local_index;
7272
path.pop();
7373
if (top.node_ptr->condition != nullptr) {
@@ -277,7 +277,7 @@ Operations createOperations(Filter const& expression)
277277

278278
// while the stack is not empty
279279
while (!path.empty()) {
280-
auto& top = path.top();
280+
auto top = path.top();
281281

282282
// create operation spec, pop the node and add its children
283283
auto operationSpec =
@@ -458,7 +458,7 @@ std::shared_ptr<gandiva::Filter>
458458
{
459459
std::shared_ptr<gandiva::Filter> filter;
460460
auto s = gandiva::Filter::Make(Schema,
461-
std::move(condition),
461+
condition,
462462
&filter);
463463
if (!s.ok()) {
464464
throw runtime_error_f("Failed to create filter: %s", s.ToString().c_str());

Framework/Core/src/runDataProcessing.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ void websocket_callback(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf)
491491
} catch (WSError& e) {
492492
LOG(error) << "Error while parsing request: " << e.message;
493493
handler->error(e.code, e.message.c_str());
494+
free(buf->base);
494495
}
495496
}
496497

0 commit comments

Comments
 (0)