Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Fix vasprintf() call usage. #165

Closed
wants to merge 1 commit into from
Closed

Fix vasprintf() call usage. #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions parameter/Element.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,37 +52,43 @@ CElement::~CElement()
// Logging
void CElement::log_info(const char* strMessage, ...) const
{
int ret_val;
char *pacBuffer;
va_list listPointer;

va_start(listPointer, strMessage);

vasprintf(&pacBuffer, strMessage, listPointer);
ret_val = vasprintf(&pacBuffer, strMessage, listPointer);

va_end(listPointer);

if (pacBuffer != NULL) {
doLog(false, pacBuffer);
if (ret_val == -1) {
return;
}

doLog(true, pacBuffer);

free(pacBuffer);
}

void CElement::log_warning(const char* strMessage, ...) const
{
int ret_val;
char *pacBuffer;
va_list listPointer;

va_start(listPointer, strMessage);

vasprintf(&pacBuffer, strMessage, listPointer);
ret_val = vasprintf(&pacBuffer, strMessage, listPointer);

va_end(listPointer);

if (pacBuffer != NULL) {
doLog(true, pacBuffer);
if (ret_val == -1) {
return;
}

doLog(true, pacBuffer);

free(pacBuffer);
}

Expand Down
18 changes: 12 additions & 6 deletions parameter/SubsystemObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,37 +215,43 @@ void CSubsystemObject::blackboardWrite(const void* pvData, uint32_t uiSize)
// Logging
void CSubsystemObject::log_info(std::string strMessage, ...) const
{
int ret_val;
char *pacBuffer;
va_list listPointer;

va_start(listPointer, strMessage);

vasprintf(&pacBuffer, strMessage.c_str(), listPointer);
ret_val = vasprintf(&pacBuffer, strMessage.c_str(), listPointer);

va_end(listPointer);

if (pacBuffer != NULL) {
_pInstanceConfigurableElement->log_info("%s", pacBuffer);
if (ret_val == -1) {
return ;
}

_pInstanceConfigurableElement->log_info("%s", pacBuffer);

free(pacBuffer);
}

void CSubsystemObject::log_warning(std::string strMessage, ...) const
{
int ret_val;
char *pacBuffer;
va_list listPointer;

va_start(listPointer, strMessage);

vasprintf(&pacBuffer, strMessage.c_str(), listPointer);
ret_val = vasprintf(&pacBuffer, strMessage.c_str(), listPointer);

va_end(listPointer);

if (pacBuffer != NULL) {
_pInstanceConfigurableElement->log_warning("%s", pacBuffer);
if (ret_val == -1) {
return ;
}

_pInstanceConfigurableElement->log_warning("%s", pacBuffer);

free(pacBuffer);
}

Expand Down