diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2009-09-08 09:47:12 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2009-09-08 09:47:12 +0200 |
| commit | 1f99b6d338186efe80e314268db44600d3c94a1e (patch) | |
| tree | ae2c0b7dd1dd1fc9602ba3acb0a792c93f875353 | |
| parent | c914647fb05653878a14ae391f52b5e94cc73b26 (diff) | |
replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208)
instead of ignoring the returncode and truncating the string on error
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 15 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 1683868c8..4c05f2df8 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -67,9 +67,20 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest) outbuf = new char[insize+1]; outptr = outbuf; - iconv(cd, &inptr, &insize, &outptr, &outsize); - *outptr = '\0'; + while (insize != 0) + { + size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize); + if (err == (size_t)(-1)) + { + insize--; + outsize++; + inptr++; + *outptr = '?'; + outptr++; + } + } + *outptr = '\0'; *dest = outbuf; delete[] outbuf; diff --git a/debian/changelog b/debian/changelog index 349c95038..34691b1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.24) UNRELEASED; urgency=low - simplify the makefiles needed for po4a manpages * apt-pkg/contrib/configuration.cc: - add a helper to easily get a vector of strings from the config + * apt-pkg/contrib/strutl.cc: + - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 |