Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2025-03-12 09:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Log: don't allow side effects in LOG() calls

Browse source
This commit is contained in:
SChernykh 2022-05-10 20:16:04 +02:00
parent edd782ac23
commit 92e20485b2
2 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/log.h
View file

@ -478,8 +478,38 @@ namespace {
#else
// This is to check that LOG() call doesn't modify variables in scope, making program behavior dependent on the log level:
//
// int some_func(int& n) { return ++n; }
// ...
// LOGINFO(1, "Some important value: " << some_func(n));
//
// will not compile because the dummy lambda capture uses const-qualified copies of all variables.
//
// The check is "free": compiler will remove it entirely in release builds.
struct DummyStream
{
template<typename T>
FORCEINLINE DummyStream& operator<<(const T&)
{
return *this;
}
};
#define SIDE_EFFECT_CHECK(level, ...) \
do { \
if (0) { \
[=]() { \
log::DummyStream x; \
x << level << __VA_ARGS__; \
}; \
} \
} while (0)
#define LOG(level, severity, ...) \
do { \
SIDE_EFFECT_CHECK(level, __VA_ARGS__); \
if (level <= log::GLOBAL_LOG_LEVEL) { \
log::Writer CONCAT(log_wrapper_, __LINE__)(severity); \
CONCAT(log_wrapper_, __LINE__) << log::Gray() << log_category_prefix; \

16
src/p2p_server.cpp
View file

@ -433,7 +433,7 @@ void P2PServer::load_peer_list()
const char* addr_str;
char addr_str_buf[64];
char buf[log::Stream::BUF_SIZE + 1];
char buf[128];
log::Stream s(buf);
if (r->ai_family == AF_INET6) {
@ -450,7 +450,7 @@ void P2PServer::load_peer_list()
}
if (s.m_pos) {
LOGINFO(4, "added " << static_cast<char*>(buf) << " from " << nodes[i]);
LOGINFO(4, "added " << static_cast<const char*>(buf) << " from " << nodes[i]);
if (!saved_list.empty()) {
saved_list += ',';
}
@ -549,33 +549,35 @@ void P2PServer::load_monerod_peer_list()
JSONRPCRequest::call(params.m_host.c_str(), params.m_rpcPort, "/get_peer_list",
[this](const char* data, size_t size)
{
constexpr char err_str[] = "/get_peer_list RPC request returned invalid JSON ";
#define ERR_STR "/get_peer_list RPC request returned invalid JSON "
using namespace rapidjson;
Document doc;
if (doc.Parse(data, size).HasParseError()) {
LOGWARN(4, err_str << "(parse error)");
LOGWARN(4, ERR_STR "(parse error)");
return;
}
if (!doc.IsObject()) {
LOGWARN(4, err_str << "(not an object)");
LOGWARN(4, ERR_STR "(not an object)");
return;
}
if (!doc.HasMember("white_list")) {
LOGWARN(4, err_str << "('white_list' not found)");
LOGWARN(4, ERR_STR "('white_list' not found)");
return;
}
const auto& white_list = doc["white_list"];
if (!white_list.IsArray()) {
LOGWARN(4, err_str << "('white_list' is not an array)");
LOGWARN(4, ERR_STR "('white_list' is not an array)");
return;
}
#undef ERR_STR
const int port = m_pool->side_chain().is_mini() ? DEFAULT_P2P_PORT_MINI : DEFAULT_P2P_PORT;
const SizeType n = white_list.Size();