forked from pool/glibc
Accepting request 361238 from home:Andreas_Schwab:Factory
- no-long-double.patch: Don't use long double functions if NO_LONG_DOUBLE - Update to glibc 2.23 release. * Unicode 8.0.0 Support * sched_setaffinity, pthread_setaffinity_np no longer attempt to guess the kernel-internal CPU set size * The fts.h header can now be used with -D_FILE_OFFSET_BITS=64 * getaddrinfo now detects certain invalid responses on an internal netlink socket * A defect in the malloc implementation, present since glibc 2.15 (2012) or glibc 2.10 via --enable-experimental-malloc (2009), could result in the unnecessary serialization of memory allocation requests across threads * The obsolete header <regexp.h> has been removed * The obsolete functions bdflush, create_module, get_kernel_syms, query_module and uselib are no longer available to newly linked binaries * Optimized string, wcsmbs and memory functions for IBM z13. * Newly linked programs that define a variable called signgam will no longer have it set by the lgamma, lgammaf and lgammal functions - Removed patches: * dont-remove-nodelete-flag.patch * openat64-readd-o-largefile.patch * mntent-blank-line.patch * opendir-o-directory-check.patch * strcoll-remove-strdiff-opt.patch * ld-pointer-guard.patch * tls-dtor-list-mangling.patch * powerpc-lock-elision-race.patch * prelink-elf-rtype-class.patch OBS-URL: https://build.opensuse.org/request/show/361238 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=423
This commit is contained in:
@@ -1,201 +0,0 @@
|
||||
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. */ \
|
Reference in New Issue
Block a user