diff options
| author | Michael Colavita <mcolavita@fb.com> | 2020-11-19 11:44:40 -0500 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2020-12-07 22:23:26 +0530 |
| commit | 228edd356f03bf62dcf2b1335f25d43c602ee68d (patch) | |
| tree | 85a40834d0c664df673a52adee19de6a040f7baa /iconv/Makefile | |
| parent | 088e9625378f25607acff3daf7a79cbdee497043 (diff) | |
| download | glibc-228edd356f03bf62dcf2b1335f25d43c602ee68d.tar.gz glibc-228edd356f03bf62dcf2b1335f25d43c602ee68d.tar.xz glibc-228edd356f03bf62dcf2b1335f25d43c602ee68d.zip | |
iconv: Fix incorrect UCS4 inner loop bounds (BZ#26923)
Previously, in UCS4 conversion routines we limit the number of characters we examine to the minimum of the number of characters in the input and the number of characters in the output. This is not the correct behavior when __GCONV_IGNORE_ERRORS is set, as we do not consume an output character when we skip a code unit. Instead, track the input and output pointers and terminate the loop when either reaches its limit. This resolves assertion failures when resetting the input buffer in a step of iconv, which assumes that the input will be fully consumed given sufficient output space.
Diffstat (limited to 'iconv/Makefile')
| -rw-r--r-- | iconv/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/iconv/Makefile b/iconv/Makefile index 30bf996d3a..f9b51e23ec 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -44,7 +44,7 @@ CFLAGS-linereader.c += -DNO_TRANSLITERATION CFLAGS-simple-hash.c += -I../locale tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 tst-iconv6 \ - tst-iconv7 tst-iconv-mt tst-iconv-opt + tst-iconv7 tst-iconv8 tst-iconv-mt tst-iconv-opt others = iconv_prog iconvconfig install-others-programs = $(inst_bindir)/iconv |