Skip to content
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

Jump to bottom

TelematicPlugin: Memory leak #599

Merged
merged 7 commits into from
Apr 16, 2024
Merged

TelematicPlugin: Memory leak #599

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
66a8390
init
dan-du-car Apr 9, 2024
fb02efe
fix
dan-du-car Apr 11, 2024
5ae22a4
add free
dan-du-car Apr 12, 2024
50de700
merge
dan-du-car Apr 12, 2024
47a2b4b
address comments
dan-du-car Apr 15, 2024
a9698c3
update
dan-du-car Apr 15, 2024
a71a538
address codesmell
dan-du-car Apr 15, 2024
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
8 changes: 6 additions & 2 deletions src/v2i-hub/TelematicBridgePlugin/src/TelematicBridgeMsgWorker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ namespace TelematicBridge
{
throw TelematicBridgeException("Failed to convert message with ID (=" + to_string(messageFrame->messageId) + ") to XML ");
}
return string(xml_buffer.buffer);
auto output = string(xml_buffer.buffer);
FREEMEM(xml_buffer.buffer);
return output;
}

/**
Expand Down Expand Up @@ -238,7 +240,9 @@ namespace TelematicBridge
}
else
{
json["payload"] = StringToJson(cJSON_Print(msg->payload));
// Render a cJSON entity to text for transfer/storage. Free the char* when finished.
auto payloadPtr = std::make_unique<char*>(cJSON_Print(msg->payload));
Copy link
Contributor

@paulbourelly999 paulbourelly999 Apr 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently std::make_unique is sort of a wrapper for new (https://en.cppreference.com/w/cpp/memory/unique_ptr/make_unique) and actually creates a new object from the passed in parameter. This is likely why we still see the memory leak with this in. Apparently this is the more appropriate way to create a unique pointer from the returned char*

 std::unique_ptr<char, decltype(std::free) *> payloadPtr{ cJSON_Print(msg->payload), std::free };

Could you try this and see if it works?

json["payload"] = StringToJson(*payloadPtr);
}
}

Expand Down
Loading