Skip to content

Commit 4964dbd

Browse files
authored
Update sa_plugin_services.cpp. Removed double LF in logs from the plugin.
1 parent 2ad1849 commit 4964dbd

1 file changed

Lines changed: 21 additions & 0 deletions

File tree

src/plugins/sa_plugin_services/sa_plugin_services.cpp

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,27 @@ void get_service_last_error(DWORD * error_code, char ** buffer, size_t * buffer_
5454
size_t size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
5555
NULL, (*error_code), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, NULL);
5656

57+
//Remove any LF or CRLF at the end of the buffer
58+
if (messageBuffer)
59+
{
60+
size_t length = strlen(messageBuffer);
61+
if (length >= 2)
62+
{
63+
// check for CRLF
64+
if (messageBuffer[length - 2] == '\r' && messageBuffer[length - 1] == '\n')
65+
{
66+
messageBuffer[length - 2] = '\0';
67+
messageBuffer[length - 1] = '\0';
68+
}
69+
70+
// check for LF
71+
if (messageBuffer[length - 1] == '\n')
72+
{
73+
messageBuffer[length - 1] = '\0';
74+
}
75+
}
76+
}
77+
5778
//Copy the error message into the output buffer.
5879
*buffer = _strdup(messageBuffer);
5980
*buffer_size = size;

0 commit comments

Comments
 (0)