3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-08 02:15:19 +00:00

zstring: fix encode rountrip for '\' as printable ASCII (#5120)

This fixes encode roundtripping for all printable ASCII characters.
In particular, this now leaves a plain '\' untouched by the
encoding logic, instead of converting it to escaped hex-digits.
It also adds unit testing covering this specific zstring encoding
property, in order to avoid future regressions.
This commit is contained in:
Luca Bruno 2021-03-23 18:25:59 +00:00 committed by GitHub
parent 119c5a995b
commit b918f121ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 1 deletions

View file

@ -129,6 +129,7 @@ add_executable(test-z3
vector.cpp
lp/lp.cpp
lp/nla_solver_test.cpp
zstring.cpp
${z3_test_extra_object_files}
)
z3_add_install_tactic_rule(${z3_test_deps})

View file

@ -215,6 +215,7 @@ int main(int argc, char ** argv) {
TST(prime_generator);
TST(permutation);
TST(nlsat);
TST(zstring);
if (test_all) return 0;
TST(ext_numeral);
TST(interval);

25
src/test/zstring.cpp Normal file
View file

@ -0,0 +1,25 @@
#include "util/debug.h"
#include "util/trace.h"
#include "util/zstring.h"
// Encode and check for roundtrip all printable ASCII characters.
static void tst_ascii_roundtrip() {
unsigned ascii_min = 0x20; // ' '
unsigned ascii_max = 0x7E; // '~'
for (unsigned i = ascii_min; i <= ascii_max; i++) {
zstring input(i);
std::string expected(1, i);
bool roundtrip_ok = input.encode() == expected;
if (!roundtrip_ok) {
std::cout << "Failed to roundtrip printable ASCII char: " << expected
<< "\n" << std::flush;
ENSURE(roundtrip_ok);
}
}
}
void tst_zstring() {
tst_ascii_roundtrip();
}

View file

@ -146,7 +146,7 @@ std::string zstring::encode() const {
#define _flush() if (offset > 0) { buffer[offset] = 0; strm << buffer; offset = 0; }
for (unsigned i = 0; i < m_buffer.size(); ++i) {
unsigned ch = m_buffer[i];
if (ch < 32 || ch >= 128 || ch == '\\') {
if (ch < 32 || ch >= 128) {
_flush();
strm << "\\u{" << std::hex << ch << std::dec << "}";
}