mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
Fix an unsigned integer comparison reported by Coverity
This commit is contained in:
parent
4c58fb26c4
commit
2ce26f1be0
1 changed files with 8 additions and 6 deletions
|
@ -525,21 +525,23 @@ void Reporter::DoLog(const char* prefix, EventHandlerPtr event, FILE* out, Conne
|
||||||
// Figure out how big of a buffer is needed here.
|
// Figure out how big of a buffer is needed here.
|
||||||
va_list ap_copy;
|
va_list ap_copy;
|
||||||
va_copy(ap_copy, ap);
|
va_copy(ap_copy, ap);
|
||||||
size_t req_buffer_size = vsnprintf(nullptr, 0, fmt, ap_copy);
|
int req_buffer_size = vsnprintf(nullptr, 0, fmt, ap_copy);
|
||||||
|
|
||||||
if ( req_buffer_size < 0 ) {
|
if ( req_buffer_size < 0 ) {
|
||||||
va_end(ap_copy);
|
va_end(ap_copy);
|
||||||
FatalError("out of memory in Reporter");
|
FatalError("out of memory in Reporter");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
size_t new_buffer_size = req_buffer_size;
|
||||||
|
|
||||||
if ( postfix && *postfix )
|
if ( postfix && *postfix )
|
||||||
req_buffer_size += strlen(postfix) + 10;
|
new_buffer_size += strlen(postfix) + 10;
|
||||||
|
|
||||||
// Add one byte for a null terminator.
|
// Add one byte for a null terminator.
|
||||||
req_buffer_size++;
|
new_buffer_size++;
|
||||||
|
|
||||||
if ( req_buffer_size > DEFAULT_BUFFER_SIZE ) {
|
if ( new_buffer_size > DEFAULT_BUFFER_SIZE ) {
|
||||||
buffer = (char*)malloc(req_buffer_size);
|
buffer = (char*)malloc(new_buffer_size);
|
||||||
if ( ! buffer ) {
|
if ( ! buffer ) {
|
||||||
va_end(ap_copy);
|
va_end(ap_copy);
|
||||||
FatalError("out of memory in Reporter");
|
FatalError("out of memory in Reporter");
|
||||||
|
@ -550,7 +552,7 @@ void Reporter::DoLog(const char* prefix, EventHandlerPtr event, FILE* out, Conne
|
||||||
|
|
||||||
va_end(ap_copy);
|
va_end(ap_copy);
|
||||||
|
|
||||||
req_buffer_size = vsnprintf(buffer, req_buffer_size, fmt, ap);
|
req_buffer_size = vsnprintf(buffer, new_buffer_size, fmt, ap);
|
||||||
if ( req_buffer_size < 0 )
|
if ( req_buffer_size < 0 )
|
||||||
FatalError("out of memory in Reporter");
|
FatalError("out of memory in Reporter");
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue