Commit eaae98e3 authored by Aurelien Jarno's avatar Aurelien Jarno

debian/patches/git-updates.diff: update from upstream stable branch.

parent fd1d2574
......@@ -6,6 +6,7 @@ glibc (2.27-5) UNRELEASED; urgency=medium
* debian/rules.d/control.mk: Add support for riscv64. Closes: #888793.
* debian/testsuite-xfail-debian.mk: add reference testsuite results for
riscv64.
* debian/patches/git-updates.diff: update from upstream stable branch.
[ Samuel Thibault ]
* debian/testsuite-xfail-debian.mk: Update hurd-i386 result to new upstream
......
GIT update of https://sourceware.org/git/glibc.git/release/2.27/master from glibc-2.27
diff --git a/ChangeLog b/ChangeLog
index f3fe2716b2..c862ca21ff 100644
index f3fe2716b2..1c77ca2a6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,496 @@
@@ -1,3 +1,503 @@
+2018-07-10 Florian Weimer <fweimer@redhat.com>
+
+ [BZ #23036]
+ * posix/regexec.c (check_node_accept_bytes): When comparing
+ weights, do not compare an extra byte after the end of the
+ weights.
+
+2018-06-29 Sylvain Lesage <severo@rednegra.net>
+
+ [BZ #22996]
......@@ -501,7 +508,7 @@ index f3fe2716b2..c862ca21ff 100644
2018-02-01 Dmitry V. Levin <ldv@altlinux.org>
* version.h (RELEASE): Set to "stable".
@@ -710,7 +1203,9 @@
@@ -710,7 +1210,9 @@
2018-01-18 Arjun Shankar <arjun@redhat.com>
[BZ #22343]
......@@ -532,10 +539,10 @@ index 80f7f14879..858076d9d3 100644
Copyright 2001 by Stephen L. Moshier <moshier@na-net.ornl.gov>
diff --git a/NEWS b/NEWS
index a71c1038a8..2e7e7837ac 100644
index a71c1038a8..957035d2f3 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,88 @@ See the end for copying conditions.
@@ -5,6 +5,90 @@ See the end for copying conditions.
Please send GNU C library bug reports via <https://sourceware.org/bugzilla/>
using `glibc' in the "product" field.
......@@ -602,7 +609,9 @@ index a71c1038a8..2e7e7837ac 100644
+ [22937] Greek (el_GR, el_CY) locales actually need ab_alt_mon
+ [22947] FAIL: misc/tst-preadvwritev2
+ [22963] cs_CZ: Add alternative month names
+ [22996] localedata: change LC_PAPER to en_US in es_BO locale
+ [23005] Crash in __res_context_send after memory allocation failure
+ [23036] regexec: Fix off-by-one bug in weight comparison
+ [23037] initialize msg_flags to zero for sendmmsg() calls
+ [23069] sigaction broken on riscv64-linux-gnu
+ [23102] Incorrect parsing of consecutive $ variables in runpath entries
......@@ -624,7 +633,7 @@ index a71c1038a8..2e7e7837ac 100644
Version 2.27
Major new features:
@@ -262,6 +344,10 @@ Security related changes:
@@ -262,6 +346,10 @@ Security related changes:
an object size near the value of SIZE_MAX, would return a pointer to a
buffer which is too small, instead of NULL. Reported by Jakub Wilk.
......@@ -13111,6 +13120,61 @@ index 859c0f69bf..ea67d19fcd 100644
+{
+ return __execvpe_common (file, argv, envp, false);
+}
diff --git a/posix/regexec.c b/posix/regexec.c
index 4b1ab4ecff..21129432d1 100644
--- a/posix/regexec.c
+++ b/posix/regexec.c
@@ -3848,30 +3848,27 @@ check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,
indirect = (const int32_t *)
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
int32_t idx = findidx (table, indirect, extra, &cp, elem_len);
+ int32_t rule = idx >> 24;
+ idx &= 0xffffff;
if (idx > 0)
- for (i = 0; i < cset->nequiv_classes; ++i)
- {
- int32_t equiv_class_idx = cset->equiv_classes[i];
- size_t weight_len = weights[idx & 0xffffff];
- if (weight_len == weights[equiv_class_idx & 0xffffff]
- && (idx >> 24) == (equiv_class_idx >> 24))
- {
- int cnt = 0;
-
- idx &= 0xffffff;
- equiv_class_idx &= 0xffffff;
-
- while (cnt <= weight_len
- && (weights[equiv_class_idx + 1 + cnt]
- == weights[idx + 1 + cnt]))
- ++cnt;
- if (cnt > weight_len)
- {
- match_len = elem_len;
- goto check_node_accept_bytes_match;
- }
- }
- }
+ {
+ size_t weight_len = weights[idx];
+ for (i = 0; i < cset->nequiv_classes; ++i)
+ {
+ int32_t equiv_class_idx = cset->equiv_classes[i];
+ int32_t equiv_class_rule = equiv_class_idx >> 24;
+ equiv_class_idx &= 0xffffff;
+ if (weights[equiv_class_idx] == weight_len
+ && equiv_class_rule == rule
+ && memcmp (weights + idx + 1,
+ weights + equiv_class_idx + 1,
+ weight_len) == 0)
+ {
+ match_len = elem_len;
+ goto check_node_accept_bytes_match;
+ }
+ }
+ }
}
}
else
diff --git a/posix/tst-glob_lstat_compat.c b/posix/tst-glob_lstat_compat.c
index c46bc9e578..22cd1f02f9 100644
--- a/posix/tst-glob_lstat_compat.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment