Gentoo Archives: gentoo-commits

From: Virgil Dupras <vdupras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libutf8proc/files/
Date: Sun, 03 Mar 2019 13:46:49
Message-Id: 1551620780.778c9f8a6fe043d449399a45c35afb30f1a624a1.vdupras@gentoo
1 commit: 778c9f8a6fe043d449399a45c35afb30f1a624a1
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Mar 1 17:20:36 2019 +0000
4 Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 3 13:46:20 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778c9f8a
7
8 dev-libs/libutf8proc: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/11190
12 Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
13
14 .../files/libutf8proc-1.3.1_p2-overrun.patch | 33 ----------------------
15 1 file changed, 33 deletions(-)
16
17 diff --git a/dev-libs/libutf8proc/files/libutf8proc-1.3.1_p2-overrun.patch b/dev-libs/libutf8proc/files/libutf8proc-1.3.1_p2-overrun.patch
18 deleted file mode 100644
19 index 8ce7f4cfbe9..00000000000
20 --- a/dev-libs/libutf8proc/files/libutf8proc-1.3.1_p2-overrun.patch
21 +++ /dev/null
22 @@ -1,33 +0,0 @@
23 ---- libutf8proc-1.3.1-2/test/iterate.c
24 -+++ libutf8proc-1.3.1-2/test/iterate.c
25 -@@ -13,11 +13,17 @@ static void testbytes(unsigned char *buf, int len, utf8proc_ssize_t retval, int
26 - utf8proc_int32_t out[16];
27 - utf8proc_ssize_t ret;
28 -
29 -+ /* Make a copy to ensure that memory is left uninitialized after "len"
30 -+ * bytes. This way, Valgrind can detect overreads.
31 -+ */
32 -+ unsigned char tmp[16];
33 -+ memcpy(tmp, buf, len);
34 -+
35 - tests++;
36 -- if ((ret = utf8proc_iterate(buf, len, out)) != retval) {
37 -+ if ((ret = utf8proc_iterate(tmp, len, out)) != retval) {
38 - fprintf(stderr, "Failed (%d):", line);
39 - for (int i = 0; i < len ; i++) {
40 -- fprintf(stderr, " 0x%02x", buf[i]);
41 -+ fprintf(stderr, " 0x%02x", tmp[i]);
42 - }
43 - fprintf(stderr, " -> %zd\n", ret);
44 - error++;
45 ---- libutf8proc-1.3.1-2/src/utf8proc.c
46 -+++ libutf8proc-1.3.1-2/src/utf8proc.c
47 -@@ -128,7 +128,7 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_iterate(
48 - if ((uc - 0xc2) > (0xf4-0xc2)) return UTF8PROC_ERROR_INVALIDUTF8;
49 - if (uc < 0xe0) { // 2-byte sequence
50 - // Must have valid continuation character
51 -- if (!utf_cont(*str)) return UTF8PROC_ERROR_INVALIDUTF8;
52 -+ if (str >= end || !utf_cont(*str)) return UTF8PROC_ERROR_INVALIDUTF8;
53 - *dst = ((uc & 0x1f)<<6) | (*str & 0x3f);
54 - return 2;
55 - }