diff options
author | Jay Berkenbilt <ejb@ql.org> | 2013-01-25 14:59:55 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2013-03-04 22:45:15 +0100 |
commit | 32b62035ce9d5d07f7396cc50a0c38215f19c906 (patch) | |
tree | c7ade8bcf294574d731dc2bc7cdf42524ee023d2 /libqpdf | |
parent | 9f1594656cc4702b4b0e99a2787e18e4b00d54d3 (diff) | |
download | qpdf-32b62035ce9d5d07f7396cc50a0c38215f19c906.tar.zst |
Replace many calls to sprintf with QUtil::hex_encode
Add QUtil::hex_encode to encode binary data has a hexadecimal string,
and use it in place of sprintf where possible.
Diffstat (limited to 'libqpdf')
-rw-r--r-- | libqpdf/MD5.cc | 11 | ||||
-rw-r--r-- | libqpdf/Pl_SHA2.cc | 13 | ||||
-rw-r--r-- | libqpdf/QPDF_Name.cc | 5 | ||||
-rw-r--r-- | libqpdf/QPDF_String.cc | 9 | ||||
-rw-r--r-- | libqpdf/QUtil.cc | 16 |
5 files changed, 22 insertions, 32 deletions
diff --git a/libqpdf/MD5.cc b/libqpdf/MD5.cc index 70be696d..57bcc45f 100644 --- a/libqpdf/MD5.cc +++ b/libqpdf/MD5.cc @@ -386,16 +386,7 @@ void MD5::print() std::string MD5::unparse() { final(); - - char result[33]; - char* p = result; - unsigned int i; - for (i = 0; i < 16; ++i) - { - sprintf(p, "%02x", digest_val[i]); - p += 2; - } - return result; + return QUtil::hex_encode(std::string((char*)digest_val, 16)); } std::string diff --git a/libqpdf/Pl_SHA2.cc b/libqpdf/Pl_SHA2.cc index 018f411f..84f24d6e 100644 --- a/libqpdf/Pl_SHA2.cc +++ b/libqpdf/Pl_SHA2.cc @@ -2,6 +2,7 @@ #include <stdexcept> #include <cstdio> #include <qpdf/PointerHolder.hh> +#include <qpdf/QUtil.hh> Pl_SHA2::Pl_SHA2(int bits, Pipeline* next) : Pipeline("sha2", next), @@ -150,15 +151,5 @@ Pl_SHA2::getHexDigest() throw std::logic_error( "digest requested for in-progress SHA2 Pipeline"); } - std::string raw = getRawDigest(); - size_t raw_size = raw.length(); - size_t hex_size = 1 + (2 * raw_size); - PointerHolder<char> bufp(true, new char[hex_size]); - char* buf = bufp.getPointer(); - buf[hex_size - 1] = '\0'; - for (unsigned int i = 0; i < raw_size; ++i) - { - std::sprintf(buf + i * 2, "%02x", (unsigned char)raw[i]); - } - return buf; + return QUtil::hex_encode(getRawDigest()); } diff --git a/libqpdf/QPDF_Name.cc b/libqpdf/QPDF_Name.cc index 19610bff..9adb25b5 100644 --- a/libqpdf/QPDF_Name.cc +++ b/libqpdf/QPDF_Name.cc @@ -2,6 +2,7 @@ #include <string.h> #include <stdio.h> +#include <qpdf/QUtil.hh> QPDF_Name::QPDF_Name(std::string const& name) : name(name) @@ -16,7 +17,6 @@ std::string QPDF_Name::normalizeName(std::string const& name) { std::string result; - char num[4]; result += name[0]; for (unsigned int i = 1; i < name.length(); ++i) { @@ -24,8 +24,7 @@ QPDF_Name::normalizeName(std::string const& name) // Don't use locale/ctype here; follow PDF spec guidelines. if (strchr("#()<>[]{}/%", ch) || (ch < 33) || (ch > 126)) { - sprintf(num, "#%02x", (unsigned char) ch); - result += num; + result += "#" + QUtil::hex_encode(std::string(&ch, 1)); } else { diff --git a/libqpdf/QPDF_String.cc b/libqpdf/QPDF_String.cc index 3a8e7074..619adef6 100644 --- a/libqpdf/QPDF_String.cc +++ b/libqpdf/QPDF_String.cc @@ -90,14 +90,7 @@ QPDF_String::unparse(bool force_binary) std::string result; if (use_hexstring) { - result += "<"; - char num[3]; - for (unsigned int i = 0; i < this->val.length(); ++i) - { - sprintf(num, "%02x", (unsigned char) this->val[i]); - result += num; - } - result += ">"; + result += "<" + QUtil::hex_encode(this->val) + ">"; } else { diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc index 3cdfdc49..faccaee7 100644 --- a/libqpdf/QUtil.cc +++ b/libqpdf/QUtil.cc @@ -2,6 +2,7 @@ #include <qpdf/qpdf-config.h> #include <qpdf/QUtil.hh> +#include <qpdf/PointerHolder.hh> #include <stdio.h> #include <errno.h> @@ -163,6 +164,21 @@ QUtil::copy_string(std::string const& str) return result; } +std::string +QUtil::hex_encode(std::string const& input) +{ + size_t input_size = input.length(); + size_t hex_size = 1 + (2 * input_size); + PointerHolder<char> bufp(true, new char[hex_size]); + char* buf = bufp.getPointer(); + buf[hex_size - 1] = '\0'; + for (unsigned int i = 0; i < input_size; ++i) + { + sprintf(buf + i * 2, "%02x", (unsigned char)input[i]); + } + return buf; +} + void QUtil::binary_stdout() { |