diff options
| author | Arjun Shankar <arjun@redhat.com> | 2020-11-04 12:19:38 +0100 |
|---|---|---|
| committer | Arjun Shankar <arjun@redhat.com> | 2020-11-04 12:19:38 +0100 |
| commit | 9a99c682144bdbd40792ebf822fe9264e0376fb5 (patch) | |
| tree | 4d67a9166705ac4445c585bf378e51c3167c81e7 /iconvdata | |
| parent | bb0719a80d2f1733d7adcdf326fc91aaf88db167 (diff) | |
| download | glibc-9a99c682144bdbd40792ebf822fe9264e0376fb5.zip glibc-9a99c682144bdbd40792ebf822fe9264e0376fb5.tar.gz glibc-9a99c682144bdbd40792ebf822fe9264e0376fb5.tar.bz2 | |
iconv: Accept redundant shift sequences in IBM1364 [BZ #26224]
The IBM1364, IBM1371, IBM1388, IBM1390 and IBM1399 character sets
share converter logic (iconvdata/ibm1364.c) which would reject
redundant shift sequences when processing input in these character
sets. This led to a hang in the iconv program (CVE-2020-27618).
This commit adjusts the converter to ignore redundant shift sequences
and adds test cases for iconv_prog hangs that would be triggered upon
their rejection. This brings the implementation in line with other
converters that also ignore redundant shift sequences (e.g. IBM930
etc., fixed in commit 692de4b3960d).
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/ibm1364.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c index 49e7267..521f082 100644 --- a/iconvdata/ibm1364.c +++ b/iconvdata/ibm1364.c @@ -158,24 +158,14 @@ enum \ if (__builtin_expect (ch, 0) == SO) \ { \ - /* Shift OUT, change to DBCS converter. */ \ - if (curcs == db) \ - { \ - result = __GCONV_ILLEGAL_INPUT; \ - break; \ - } \ + /* Shift OUT, change to DBCS converter (redundant escape okay). */ \ curcs = db; \ ++inptr; \ continue; \ } \ if (__builtin_expect (ch, 0) == SI) \ { \ - /* Shift IN, change to SBCS converter. */ \ - if (curcs == sb) \ - { \ - result = __GCONV_ILLEGAL_INPUT; \ - break; \ - } \ + /* Shift IN, change to SBCS converter (redundant escape okay). */ \ curcs = sb; \ ++inptr; \ continue; \ |