3963d943f
Colin Watson
2010-04-26
Subject
ash: refresh stack pointers after makestrspace in rmescapes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash.c+4 -0
| @@ -5425,7 +5425,11 @@ rmescapes(char *str, int flag) | |
| size_t fulllen = len + strlen(p) + 1; | |
| if (flag & RMESCAPE_GROW) { | |
| + | int strloc = str - (char *)stackblock(); |
| r = makestrspace(fulllen, expdest); | |
| + | /* p and str may be invalidated by makestrspace */ |
| + | str = (char *)stackblock() + strloc; |
| + | p = str + len; |
| } else if (flag & RMESCAPE_HEAP) { | |
| r = ckmalloc(fulllen); | |
| } else { | |