lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-28 20:02:00 +03:00
Code Activity

Fix escape_json() compilation error due to type limits check

Browse Source 
Compilation failed on arm64 with

  error: comparison is always true due to limited range of data type
  [-Werror=type-limits]

for
  if (0x0 <= *c && *c <= 0x1f)

This was because char is unsigned on arm64 and thus always greater
than zero.

Fixed by using std::iscntrl() instead of explicit range check.
This adds also backspace into set of escaped characters.
This commit is contained in:
Teemu Ollakka
2023-01-23 11:08:32 +02:00
parent 275a0af8c5
commit 940ba9bd0e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/reporter.cpp
View File

@ -155,7 +155,11 @@ static std::string escape_json(const std::string& str)
case '\r': os << "\\r"; break; case '\r': os << "\\r"; break;
case '\t': os << "\\t"; break; case '\t': os << "\\t"; break;
default: default:
if (0x0 <= *c && *c <= 0x1f) // std::iscntrl() returns non-zero for [0x00, 0x1f] and
// backspace character. Argument type is int so cast to
// unsigned char is needed to make it safe, see
// https://en.cppreference.com/w/cpp/string/byte/iscntrl
if (std::iscntrl(static_cast<unsigned char>(*c)))
{ {
os << "\\u" << std::hex << std::setw(4) << os << "\\u" << std::hex << std::setw(4) <<
std::setfill('0') << static_cast<int>(*c); std::setfill('0') << static_cast<int>(*c);