Fix off-by-one which caused BZ #18042 and add a test for it.

diff --git a/ChangeLog b/ChangeLog
index 7858d6b..abb948f 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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);