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.21-175-gf8ba70e
- From: ppluzhnikov at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 Mar 2015 04:56:33 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-175-gf8ba70e
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 f8ba70e9f8ad2707951882c535ea27909d8d762d (commit)
from 36103ba2f5db530bff24896dfc9076955fba3b5f (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f8ba70e9f8ad2707951882c535ea27909d8d762d
commit f8ba70e9f8ad2707951882c535ea27909d8d762d
Author: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Sun Mar 8 21:55:13 2015 -0700
Fix off-by-one which caused BZ #18042 and add a test for it.
diff --git a/ChangeLog b/ChangeLog
index 7858d6b..abb948f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2015-03-09 Paul Pluzhnikov <ppluzhnikov@google.com>
+ [BZ #18042]
+ * posix/wordexp.c (parse_backtick): Fix off-by-one.
+ * posix/wordexp-test.c (test_case): Add test for BZ #18042.
+
+2015-03-09 Paul Pluzhnikov <ppluzhnikov@google.com>
+
[BZ #18043]
* posix/wordexp-test.c (test_case): Add test for BZ #18043
(do_bz18043): Delete.
diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c
index dfe4443..845407e 100644
--- a/posix/wordexp-test.c
+++ b/posix/wordexp-test.c
@@ -234,7 +234,8 @@ struct test_case_struct
{ WRDE_CMDSUB, NULL, "$((1+`echo 1`))", WRDE_NOCMD, 0, { NULL, }, IFS },
{ WRDE_CMDSUB, NULL, "$((1+$((`echo 1`))))", WRDE_NOCMD, 0, { NULL, }, IFS },
- { WRDE_SYNTAX, NULL, "${", 0, 0, { NULL, }, IFS }, /* BZ 18043 */
+ { WRDE_SYNTAX, NULL, "`\\", 0, 0, { NULL, }, IFS }, /* BZ 18042 */
+ { WRDE_SYNTAX, NULL, "${", 0, 0, { NULL, }, IFS }, /* BZ 18043 */
{ -1, NULL, NULL, 0, 0, { NULL, }, IFS },
};
diff --git a/posix/wordexp.c b/posix/wordexp.c
index 1c14401..ae4fd72 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -2143,7 +2143,6 @@ parse_backtick (char **word, size_t *word_length, size_t *max_length,
break;
}
- ++(*offset);
error = parse_backslash (&comm, &comm_length, &comm_maxlen, words,
offset);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
posix/wordexp-test.c | 3 ++-
posix/wordexp.c | 1 -
3 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources