diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/utils.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index b4719ec91..f0ff5b109 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-11-27 Barton E. Schaefer <schaefer@zsh.org> + + * 32061: Src/utils.c: Fix "use of uninitialized memory" in metafy + 2013-11-27 Peter Stephenson <p.stephenson@samsung.com> * unposted, see 32054 and thread: diff --git a/Src/utils.c b/Src/utils.c index 0db9c30a6..c6d178ce2 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -3985,7 +3985,7 @@ metafy(char *buf, int len, int heap) if (imeta(*e++)) meta++; - if (meta || heap == META_DUP || heap == META_HEAPDUP || *e != '\0') { + if (meta || heap == META_DUP || heap == META_HEAPDUP) { switch (heap) { case META_REALLOC: buf = zrealloc(buf, len + meta + 1); @@ -4028,8 +4028,8 @@ metafy(char *buf, int len, int heap) meta--; } } - *e = '\0'; } + *e = '\0'; return buf; } |