diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-11-04 23:38:40 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-11-05 12:21:33 +0100 |
| commit | 4453cfdcf42f7fe6859bb0fc6b310a2a391bee77 (patch) | |
| tree | c448b9ec5b7dbbd1b6afd495f0831dd95e1c8180 | |
| parent | 258b9e512c4001e806c5c0966acecd3d742ec6e9 (diff) | |
encode UTF-8 characters correctly in QuoteString
Limit the field length to a char to avoid bogus FF for
utf-8 characters with the default length.
Closes: 799123
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 2 | ||||
| -rw-r--r-- | test/libapt/strutil_test.cc | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 05624f7fb..396cb7898 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -331,7 +331,7 @@ string QuoteString(const string &Str, const char *Bad) *I == 0x25 || // percent '%' char *I <= 0x20 || *I >= 0x7F) // control chars { - ioprintf(Res,"%%%02x",(int)*I); + ioprintf(Res, "%%%02hhx", *I); } else Res << *I; diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc index 23dc08727..8947aea59 100644 --- a/test/libapt/strutil_test.cc +++ b/test/libapt/strutil_test.cc @@ -235,3 +235,14 @@ TEST(StrUtilTest,ReadMessages) ReadMessagesTestWithNewLine("\n\n", "ab"); ReadMessagesTestWithNewLine("\r\n\r\n", "ab"); } +TEST(StrUtilTest,QuoteString) +{ + EXPECT_EQ("", QuoteString("", "")); + EXPECT_EQ("K%c3%b6ln", QuoteString("Köln", "")); + EXPECT_EQ("Köln", DeQuoteString(QuoteString("Köln", ""))); + EXPECT_EQ("Köln", DeQuoteString(DeQuoteString(QuoteString(QuoteString("Köln", ""), "")))); + EXPECT_EQ("~-_$#|u%c3%a4%c3%b6%c5%a6%e2%84%a2%e2%85%9e%c2%b1%c3%86%e1%ba%9e%c2%aa%c3%9f", QuoteString("~-_$#|uäöŦ™⅞±Æẞªß", "")); + EXPECT_EQ("~-_$#|uäöŦ™⅞±Æẞªß", DeQuoteString(QuoteString("~-_$#|uäöŦ™⅞±Æẞªß", ""))); + EXPECT_EQ("%45ltvill%65%2d%45rbach", QuoteString("Eltville-Erbach", "E-Ae")); + EXPECT_EQ("Eltville-Erbach", DeQuoteString(QuoteString("Eltville-Erbach", ""))); +} |