]> git.ipfire.org Git - thirdparty/glibc.git/commit
gconv: Fix assertion failure in ISO-2022-JP-3 module (bug 27256)
authorFlorian Weimer <fweimer@redhat.com>
Wed, 27 Jan 2021 12:36:12 +0000 (13:36 +0100)
committerFlorian Weimer <fweimer@redhat.com>
Wed, 27 Jan 2021 14:51:17 +0000 (15:51 +0100)
commite9db77683e10c589529f452710868c3bde2c6d3f
tree314d42f61f8b9a2db53d4abf04a1ce2b43c0bc3e
parent44fd8887d0dc705ee5a8e52153282292841e0a01
gconv: Fix assertion failure in ISO-2022-JP-3 module (bug 27256)

The conversion loop to the internal encoding does not follow
the interface contract that __GCONV_FULL_OUTPUT is only returned
after the internal wchar_t buffer has been filled completely.  This
is enforced by the first of the two asserts in iconv/skeleton.c:

      /* We must run out of output buffer space in this
 rerun.  */
      assert (outbuf == outerr);
      assert (nstatus == __GCONV_FULL_OUTPUT);

This commit solves this issue by queuing a second wide character
which cannot be written immediately in the state variable, like
other converters already do (e.g., BIG5-HKSCS or TSCII).

Reported-by: Tavis Ormandy <taviso@gmail.com>
(cherry picked from commit 7d88c6142c6efc160c0ee5e4f85cde382c072888)
iconvdata/Makefile
iconvdata/bug-iconv14.c [new file with mode: 0644]
iconvdata/iso-2022-jp-3.c