This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.10-286-g52db803
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 23 Aug 2009 22:22:33 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.10-286-g52db803
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 52db8039f54672abe6a6da5fb107fa52aca42547 (commit)
via bdc7f5d76b4f284475595dddc79f0e0f9720ec20 (commit)
via 2d094b739598d2e1718d3cc4c5af7e95787bd463 (commit)
from c6b6723e6b756d36d9912a1c430459634e15758b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=52db8039f54672abe6a6da5fb107fa52aca42547
commit 52db8039f54672abe6a6da5fb107fa52aca42547
Author: Ulrich Drepper <drepper@redhat.com>
Date: Sun Aug 23 15:22:00 2009 -0700
Recognize ill-formed { } expressions in regcomp.
diff --git a/ChangeLog b/ChangeLog
index a42e20b..37cd868 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2009-08-23 Ulrich Drepper <drepper@redhat.com>
+ * posix/regcomp.c (parse_dup_op): Verify the expression is correctly
+ terminated.
+
* posix/unistd.h: Define _POSIX_VERSION and _POSIX2_* correctly if
older POSIX versions are selected.
diff --git a/posix/regcomp.c b/posix/regcomp.c
index 4843cfe..446fed5 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -2481,7 +2481,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
return elem;
}
- if (BE (end != -1 && start > end, 0))
+ if (BE ((end != -1 && start > end) || token->type != OP_CLOSE_DUP_NUM, 0))
{
/* First number greater than second. */
*err = REG_BADBR;
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=bdc7f5d76b4f284475595dddc79f0e0f9720ec20
commit bdc7f5d76b4f284475595dddc79f0e0f9720ec20
Author: Ulrich Drepper <drepper@redhat.com>
Date: Sun Aug 23 14:55:51 2009 -0700
Also correct _POSIX2_* constants in case older standards are selected.
diff --git a/ChangeLog b/ChangeLog
index 280afff..a42e20b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2009-08-23 Ulrich Drepper <drepper@redhat.com>
- * posix/unistd.h: Define _POSIX_VERSION correctly if older POSIX
- versions are selected.
+ * posix/unistd.h: Define _POSIX_VERSION and _POSIX2_* correctly if
+ older POSIX versions are selected.
* stdio-common/printf_fp.c: ISO C expects to print the sign of NaN
as well.
diff --git a/posix/unistd.h b/posix/unistd.h
index 2de9a68..d9ecb5e 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -50,24 +50,38 @@ __BEGIN_DECLS
/* These are not #ifdef __USE_POSIX2 because they are
in the theoretically application-owned namespace. */
+#ifdef __USE_XOPEN2K8
+# define __POSIX2_THIS_VERSION 200809L
+/* The utilities on GNU systems also correspond to this version. */
+#elif defined __USE_XOPEN2K
+/* The utilities on GNU systems also correspond to this version. */
+# define __POSIX2_THIS_VERSION 200112L
+#elif defined __USE_POSIX199506
+/* The utilities on GNU systems also correspond to this version. */
+# define __POSIX2_THIS_VERSION 199506L
+#else
+/* The utilities on GNU systems also correspond to this version. */
+# define __POSIX2_THIS_VERSION 199209L
+#endif
+
/* The utilities on GNU systems also correspond to this version. */
-#define _POSIX2_VERSION 200809L
+#define _POSIX2_VERSION __POSIX2_THIS_VERSION
/* If defined, the implementation supports the
C Language Bindings Option. */
-#define _POSIX2_C_BIND 200809L
+#define _POSIX2_C_BIND __POSIX2_THIS_VERSION
/* If defined, the implementation supports the
C Language Development Utilities Option. */
-#define _POSIX2_C_DEV 200809L
+#define _POSIX2_C_DEV __POSIX2_THIS_VERSION
/* If defined, the implementation supports the
Software Development Utilities Option. */
-#define _POSIX2_SW_DEV 200809L
+#define _POSIX2_SW_DEV __POSIX2_THIS_VERSION
/* If defined, the implementation supports the
creation of locales with the localedef utility. */
-#define _POSIX2_LOCALEDEF 200809L
+#define _POSIX2_LOCALEDEF __POSIX2_THIS_VERSION
/* X/Open version number to which the library conforms. It is selectable. */
#ifdef __USE_XOPEN2K8
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2d094b739598d2e1718d3cc4c5af7e95787bd463
commit 2d094b739598d2e1718d3cc4c5af7e95787bd463
Author: Ulrich Drepper <drepper@redhat.com>
Date: Sun Aug 23 13:59:41 2009 -0700
More namespace cleanups.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 88975a7..098ef3b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-23 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/bits/posix_opt.h: Clean up namespace.
+
2009-08-11 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S: Add CFI
diff --git a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
index f9fa4e5..2550355 100644
--- a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -85,15 +85,17 @@
/* We support priority inheritence. */
#define _POSIX_THREAD_PRIO_INHERIT 200809L
-/* We support priority inheritence for robust mutexes. */
-#define _POSIX_THREAD_ROBUST_PRIO_INHERIT 200809L
-
/* We support priority protection, though only for non-robust
mutexes. */
#define _POSIX_THREAD_PRIO_PROTECT 200809L
+#ifdef __USE_XOPEN2K8
+/* We support priority inheritence for robust mutexes. */
+# define _POSIX_THREAD_ROBUST_PRIO_INHERIT 200809L
+
/* We do not support priority protection for robust mutexes. */
-#define _POSIX_THREAD_ROBUST_PRIO_PROTECT -1
+# define _POSIX_THREAD_ROBUST_PRIO_PROTECT -1
+#endif
/* We support POSIX.1b semaphores. */
#define _POSIX_SEMAPHORES 200809L
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++--
nptl/ChangeLog | 4 ++++
nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h | 10 ++++++----
posix/regcomp.c | 2 +-
posix/unistd.h | 24 +++++++++++++++++++-----
5 files changed, 35 insertions(+), 12 deletions(-)
hooks/post-receive
--
GNU C Library master sources