AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Length check accommodates NUL emitted by sprintf (#10128)

Browse Source 
Update the length check in google::protobuf::CEscapeInternal to account
for the extra NUL character emitted by snprintf when escaping hex and
octal sequences.

That function is an internal detail, not exported via any header.
Internally, it is used in two places, and both calls make buffers
that do have space for the extra NUL.
So in the actual usage, the check is redundant.
This commit is contained in:
David Neto 2022-06-09 19:30:53 -04:00 committed by GitHub
parent 1bbf6f37cc
commit af699898d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/google/protobuf/stubs/strutil.cc
View File

@ -501,7 +501,9 @@ int CEscapeInternal(const char* src, int src_len, char* dest,
if ((!utf8_safe || static_cast<uint8_t>(*src) < 0x80) && if ((!utf8_safe || static_cast<uint8_t>(*src) < 0x80) &&
(!isprint(*src) || (!isprint(*src) ||
(last_hex_escape && isxdigit(*src)))) { (last_hex_escape && isxdigit(*src)))) {
if (dest_len - used < 4) // need space for 4 letter escape // need space for 4 letter escape and the trailing '\0' to
// be written by snprintf.
if (dest_len - used < 5)
return -1; return -1;
snprintf(dest + used, 5, (use_hex ? "\\x%02x" : "\\%03o"), snprintf(dest + used, 5, (use_hex ? "\\x%02x" : "\\%03o"),
static_cast<uint8_t>(*src)); static_cast<uint8_t>(*src));