diff options
| author | Jim Meyering <jim@meyering.net> | 2009-11-04 16:38:31 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-11-04 16:38:31 -0500 |
| commit | 378b8cbb7cdc87b85a5b683000b28012eb058d3b (patch) | |
| tree | 069b1bc7094f62f6581cbe51965852ff4d113317 | |
| parent | [CD] Lookup PWD after going through CDPATH (diff) | |
| download | dash-378b8cbb7cdc87b85a5b683000b28012eb058d3b.tar.gz dash-378b8cbb7cdc87b85a5b683000b28012eb058d3b.zip | |
[PARSER] Fix syntax array size
On Mon, Sep 28, 2009 at 11:00:05AM +0200, Jim Meyering wrote: > A DEL (0177, dec 127) byte in a here-document would cause dash to > access uninitialized memory at the end of one of the syntax.c tables, > since those tables are sized to accommodate a maximum index of > BASESYNTAX + 126. Make the generated tables one byte larger. > printf ':<<\\E\n\200y\nE'|./dash > * src/mksyntax.c (filltable): Use 258, not 257 as the size, > so that BASESYNTAX(=130) + 127 is a valid index. > (print): Likewise. > Don't emit explicit array dimension in declaration. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | src/mksyntax.c | 6 |
2 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index d9dcb0c..fabb0e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2009-09-28 Jim Meyering <meyering@redhat.com> + + don't read-uninitialized for \177 in a here-doc + A DEL (0177, dec 127) byte in a here-document would cause dash to + access uninitialized memory at the end of one of the syntax.c tables, + since those tables are sized to accommodate a maximum index of + BASESYNTAX + 126. Make the generated tables one byte larger. + printf ':<<\\E\n\200y\nE'|./dash + * src/mksyntax.c (filltable): Use 258, not 257 as the size, + so that BASESYNTAX(=130) + 127 is a valid index. + (print): Likewise. + Don't emit explicit array dimension in declaration. + 2009-08-31 Eric Blake <ebb9@byu.net> * Avoid compiler warnings on isdigit. diff --git a/src/mksyntax.c b/src/mksyntax.c index 7a8a9ae..a23c18c 100644 --- a/src/mksyntax.c +++ b/src/mksyntax.c @@ -223,7 +223,7 @@ filltable(char *dftval) { int i; - for (i = 0 ; i < 257; i++) + for (i = 0 ; i < 258; i++) syntax[i] = dftval; } @@ -269,9 +269,9 @@ print(char *name) int col; fprintf(hfile, "extern const char %s[];\n", name); - fprintf(cfile, "const char %s[%d] = {\n", name, 257); + fprintf(cfile, "const char %s[] = {\n", name); col = 0; - for (i = 0 ; i < 257; i++) { + for (i = 0 ; i < 258; i++) { if (i == 0) { fputs(" ", cfile); } else if ((i & 03) == 0) { |