octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 19:08:59 +00:00
Code Issues Releases Wiki Activity

Add new function QUtil::hex_encode_char

Browse Source
This commit is contained in:
m-holger 2023-01-04 11:17:01 +00:00 committed by Jay Berkenbilt
parent 1326ff7f79
commit 942a2c3f68
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/qpdf/QUtil.hh
View File

@ -210,6 +210,11 @@ namespace QUtil
QPDF_DLL QPDF_DLL
std::string hex_encode(std::string const&); std::string hex_encode(std::string const&);
// Returns lower-case hex-encoded version of the char including a leading
// "#".
QPDF_DLL
inline std::string hex_encode_char(char);
// Returns a string that is the result of decoding the input // Returns a string that is the result of decoding the input
// string. The input string may consist of mixed case hexadecimal // string. The input string may consist of mixed case hexadecimal
// digits. Any characters that are not hexadecimal digits will be // digits. Any characters that are not hexadecimal digits will be
@ -583,4 +588,12 @@ QUtil::is_number(char const* p)
return found_digit; return found_digit;
} }
inline std::string
QUtil::hex_encode_char(char c)
{
static auto constexpr hexchars = "0123456789abcdef";
return {
'#', hexchars[static_cast<unsigned char>(c) >> 4], hexchars[c & 0x0f]};
}
#endif // QUTIL_HH #endif // QUTIL_HH

2
libqpdf/QPDF_Name.cc
View File

@ -38,7 +38,7 @@ QPDF_Name::normalizeName(std::string const& name)
// invalid #. // invalid #.
result += "#"; result += "#";
} else if (strchr("#()<>[]{}/%", ch) || (ch < 33) || (ch > 126)) { } else if (strchr("#()<>[]{}/%", ch) || (ch < 33) || (ch > 126)) {
result += "#" + QUtil::hex_encode(std::string(&ch, 1)); result += QUtil::hex_encode_char(ch);
} else { } else {
result += ch; result += ch;
} }