forked from pool/glibc
Andreas Schwab
d2f37bcdab
- Update to glibc 2.20 release.
* Reverted change of ABI data structures for s390 and s390x
* Support for file description locks is added to systems running the
Linux kernel
* Optimized strchr implementation for AArch64
* The minimum Linux kernel version that this version of the GNU C Library
can be used with is 2.6.32
* Running the testsuite no longer terminates as soon as a test fails
* The am33 port, which had not worked for several years, has been removed
from ports.
* The _BSD_SOURCE and _SVID_SOURCE feature test macros are no longer
supported; they now act the same as _DEFAULT_SOURCE (but generate a
warning)
* Optimized strcmp implementation for ARMv7
* Added support for TX lock elision of pthread mutexes on s390 and s390x
* All supported architectures now use the main glibc sysdeps directory
instead of some being in a separate "ports" directory
* The NPTL implementation of POSIX pthreads is no longer an "add-on"
* Locale names, including those obtained from environment variables (LANG
and the LC_* variables), are more tightly checked for proper syntax
* On x86-64, the dynamic linker's lazy-binding support is now compatible
with application code using Intel MPX instructions
- Patches from upstream removed
* nss-dns-memleak.patch
* sin-sign.patch
* pldd-wait-ptrace-stop.patch
* nscd-track-startup-failures.patch
* powerpc-opt-power8.patch
* check-pf-alloca.patch
* getaddrinfo-uninit-result.patch
OBS-URL: https://build.opensuse.org/request/show/249235
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=387
202 lines
6.3 KiB
Diff
202 lines
6.3 KiB
Diff
Avoid redundant shift character in iconv output at block boundary (bug #17197)
|
|
|
|
[BZ #17197]
|
|
* iconvdata/ibm930.c (BODY for TO_LOOP): Record current DBCS state
|
|
immediately after emitting SI.
|
|
* iconvdata/ibm933.c (BODY for TO_LOOP): Likewise.
|
|
* iconvdata/ibm935.c (BODY for TO_LOOP): Likewise.
|
|
* iconvdata/ibm937.c (BODY for TO_LOOP): Likewise.
|
|
* iconvdata/ibm939.c (BODY for TO_LOOP): Likewise.
|
|
* iconvdata/bug-iconv10.c: New file.
|
|
* iconvdata/Makefile (tests): Add bug-iconv10.
|
|
($(objpfx)bug-iconv10.out): New rule.
|
|
|
|
Index: glibc-2.19/iconvdata/Makefile
|
|
===================================================================
|
|
--- glibc-2.19.orig/iconvdata/Makefile
|
|
+++ glibc-2.19/iconvdata/Makefile
|
|
@@ -67,7 +67,8 @@ include ../Makeconfig
|
|
|
|
ifeq (yes,$(build-shared))
|
|
tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
|
|
- tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9
|
|
+ tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
|
|
+ bug-iconv10
|
|
ifeq ($(have-thread-library),yes)
|
|
tests += bug-iconv3
|
|
endif
|
|
@@ -295,6 +296,8 @@ $(objpfx)tst-iconv4.out: $(objpfx)gconv-
|
|
$(addprefix $(objpfx),$(modules.so))
|
|
$(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \
|
|
$(addprefix $(objpfx),$(modules.so))
|
|
+$(objpfx)bug-iconv10.out: $(objpfx)gconv-modules \
|
|
+ $(addprefix $(objpfx),$(modules.so))
|
|
|
|
$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
|
|
$(addprefix $(objpfx),$(modules.so)) \
|
|
Index: glibc-2.19/iconvdata/bug-iconv10.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/iconvdata/bug-iconv10.c
|
|
@@ -0,0 +1,60 @@
|
|
+/* bug 17197: check for redundant shift character at block boundary. */
|
|
+#include <iconv.h>
|
|
+#include <locale.h>
|
|
+#include <stdio.h>
|
|
+#include <stdlib.h>
|
|
+#include <string.h>
|
|
+#include <errno.h>
|
|
+
|
|
+static int
|
|
+do_test (void)
|
|
+{
|
|
+ iconv_t cd = iconv_open ("IBM930", "UTF-8");
|
|
+ if (cd == (iconv_t) -1)
|
|
+ {
|
|
+ puts ("iconv_open failed");
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+ char instr1[] = "\xc2\xa6.";
|
|
+ const char expstr1[4] = "\016Bj\017";
|
|
+ const char expstr2[] = "K";
|
|
+ char outstr[4];
|
|
+ size_t inlen = sizeof (instr1);
|
|
+ size_t outlen = sizeof (outstr);
|
|
+ char *inptr = instr1;
|
|
+ char *outptr = outstr;
|
|
+ size_t r = iconv (cd, &inptr, &inlen, &outptr, &outlen);
|
|
+ if (r != -1
|
|
+ || errno != E2BIG
|
|
+ || inlen != sizeof (instr1) - 2
|
|
+ || inptr != instr1 + 2
|
|
+ || outlen != 0
|
|
+ || memcmp (outstr, expstr1, sizeof (expstr1)) != 0)
|
|
+ {
|
|
+ puts ("wrong first conversion");
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+ outlen = sizeof (outstr);
|
|
+ outptr = outstr;
|
|
+ r = iconv (cd, &inptr, &inlen, &outptr, &outlen);
|
|
+ if (r != 0
|
|
+ || inlen != 0
|
|
+ || outlen != sizeof (outstr) - sizeof (expstr2)
|
|
+ || memcmp (outstr, expstr2, sizeof (expstr2)) != 0)
|
|
+ {
|
|
+ puts ("wrong second conversion");
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+ if (iconv_close (cd) != 0)
|
|
+ {
|
|
+ puts ("iconv_close failed");
|
|
+ return 1;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+#define TEST_FUNCTION do_test ()
|
|
+#include "../test-skeleton.c"
|
|
Index: glibc-2.19/iconvdata/ibm930.c
|
|
===================================================================
|
|
--- glibc-2.19.orig/iconvdata/ibm930.c
|
|
+++ glibc-2.19/iconvdata/ibm930.c
|
|
@@ -255,6 +255,7 @@ enum
|
|
break; \
|
|
} \
|
|
*outptr++ = SI; \
|
|
+ curcs = sb; \
|
|
} \
|
|
\
|
|
if (__glibc_unlikely (outptr + 1 > outend)) \
|
|
@@ -268,7 +269,6 @@ enum
|
|
*outptr++ = 0x5b; \
|
|
else \
|
|
*outptr++ = cp[0]; \
|
|
- curcs = sb; \
|
|
} \
|
|
\
|
|
/* Now that we wrote the output increment the input pointer. */ \
|
|
Index: glibc-2.19/iconvdata/ibm933.c
|
|
===================================================================
|
|
--- glibc-2.19.orig/iconvdata/ibm933.c
|
|
+++ glibc-2.19/iconvdata/ibm933.c
|
|
@@ -254,6 +254,7 @@ enum
|
|
break; \
|
|
} \
|
|
*outptr++ = SI; \
|
|
+ curcs = sb; \
|
|
} \
|
|
\
|
|
if (__glibc_unlikely (outptr + 1 > outend)) \
|
|
@@ -262,7 +263,6 @@ enum
|
|
break; \
|
|
} \
|
|
*outptr++ = cp[0]; \
|
|
- curcs = sb; \
|
|
} \
|
|
\
|
|
/* Now that we wrote the output increment the input pointer. */ \
|
|
Index: glibc-2.19/iconvdata/ibm935.c
|
|
===================================================================
|
|
--- glibc-2.19.orig/iconvdata/ibm935.c
|
|
+++ glibc-2.19/iconvdata/ibm935.c
|
|
@@ -254,6 +254,7 @@ enum
|
|
break; \
|
|
} \
|
|
*outptr++ = SI; \
|
|
+ curcs = sb; \
|
|
} \
|
|
\
|
|
if (__glibc_unlikely (outptr + 1 > outend)) \
|
|
@@ -262,7 +263,6 @@ enum
|
|
break; \
|
|
} \
|
|
*outptr++ = cp[0]; \
|
|
- curcs = sb; \
|
|
} \
|
|
\
|
|
/* Now that we wrote the output increment the input pointer. */ \
|
|
Index: glibc-2.19/iconvdata/ibm937.c
|
|
===================================================================
|
|
--- glibc-2.19.orig/iconvdata/ibm937.c
|
|
+++ glibc-2.19/iconvdata/ibm937.c
|
|
@@ -254,6 +254,7 @@ enum
|
|
break; \
|
|
} \
|
|
*outptr++ = SI; \
|
|
+ curcs = sb; \
|
|
} \
|
|
\
|
|
if (__glibc_unlikely (outptr + 1 > outend)) \
|
|
@@ -262,7 +263,6 @@ enum
|
|
break; \
|
|
} \
|
|
*outptr++ = cp[0]; \
|
|
- curcs = sb; \
|
|
} \
|
|
\
|
|
/* Now that we wrote the output increment the input pointer. */ \
|
|
Index: glibc-2.19/iconvdata/ibm939.c
|
|
===================================================================
|
|
--- glibc-2.19.orig/iconvdata/ibm939.c
|
|
+++ glibc-2.19/iconvdata/ibm939.c
|
|
@@ -254,6 +254,7 @@ enum
|
|
break; \
|
|
} \
|
|
*outptr++ = SI; \
|
|
+ curcs = sb; \
|
|
} \
|
|
\
|
|
if (__glibc_unlikely (outptr + 1 > outend)) \
|
|
@@ -267,7 +268,6 @@ enum
|
|
*outptr++ = 0xb2; \
|
|
else \
|
|
*outptr++ = cp[0]; \
|
|
- curcs = sb; \
|
|
} \
|
|
\
|
|
/* Now that we wrote the output increment the input pointer. */ \
|