mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-20 12:53:38 +00:00
Code Activity

Improve format2ostream.

Browse source 
Instead of looping to find a big enough buffer, we can call the
correct function to calculate it, remembering to add an extra
character for NUL termination.

We also correctly do a va_copy of the args to avoid crashes on
some platforms.
This commit is contained in:
Bruce Mitchener 2018-10-21 19:28:31 +07:00
parent 21cf218a9f
commit 129353542c
1 changed files with 15 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/util/warning.cpp
View file

@ -16,8 +16,8 @@ Author:
Revision History: Revision History:
--*/ --*/
#include<stdio.h> #include <stdio.h>
#include<stdarg.h> #include <stdarg.h>
#include "util/error_codes.h" #include "util/error_codes.h"
#include "util/util.h" #include "util/util.h"
@ -86,38 +86,22 @@ void disable_error_msg_prefix() {
void format2ostream(std::ostream & out, char const* msg, va_list args) { void format2ostream(std::ostream & out, char const* msg, va_list args) {
svector<char> buff; svector<char> buff;
#if !defined(_WINDOWS) && defined(_AMD64_)
// see comment below.
buff.resize(1024);
#else
buff.resize(128);
#endif
BEGIN_ERR_HANDLER(); BEGIN_ERR_HANDLER();
while (true) {
int nc = VPRF(buff.c_ptr(), buff.size(), msg, args); va_list args_copy;
#if !defined(_WINDOWS) && defined(_AMD64_) va_copy(args_copy, args);
// For some strange reason, on Linux 64-bit version, va_list args is reset by vsnprintf. #ifdef _WINDOWS
// Z3 crashes when trying to use va_list args again. size_t msg_len = _vscprintf(msg, args_copy);
// Hack: I truncate the message instead of expanding the buffer to make sure that
// va_list args is only used once.
END_ERR_HANDLER();
if (nc < 0) {
// vsnprintf didn't work, so we just print the msg
out << msg;
return;
}
if (nc >= static_cast<int>(buff.size())) {
// truncate the message
buff[buff.size() - 1] = 0;
}
out << buff.c_ptr();
return;
#else #else
if (nc >= 0 && nc < static_cast<int>(buff.size())) size_t msg_len = vsnprintf(NULL, 0, msg, args_copy);
break; // success
buff.resize(buff.size()*2 + 1);
#endif #endif
} va_end(args_copy);
// +1 is for NUL termination.
buff.resize(msg_len + 1);
VPRF(buff.c_ptr(), buff.size(), msg, args);
END_ERR_HANDLER(); END_ERR_HANDLER();
out << buff.c_ptr(); out << buff.c_ptr();
} }