emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't segfault if the first word is the empty string.

Browse Source
This commit is contained in:
Matt Kraai 2001-05-02 14:48:48 +00:00
parent e67c3ce327
commit f162e7d09d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hush.c
View File

@ -1298,7 +1298,7 @@ static int globhack(const char *src, int flags, glob_t *pglob)
int cnt, pathc; int cnt, pathc;
const char *s; const char *s;
char *dest; char *dest;
for (cnt=1, s=src; *s; s++) { for (cnt=1, s=src; s && *s; s++) {
if (*s == '\\') s++; if (*s == '\\') s++;
cnt++; cnt++;
} }
@ -1315,7 +1315,7 @@ static int globhack(const char *src, int flags, glob_t *pglob)
if (pglob->gl_pathv == NULL) return GLOB_NOSPACE; if (pglob->gl_pathv == NULL) return GLOB_NOSPACE;
pglob->gl_pathv[pathc-1]=dest; pglob->gl_pathv[pathc-1]=dest;
pglob->gl_pathv[pathc]=NULL; pglob->gl_pathv[pathc]=NULL;
for (s=src; *s; s++, dest++) { for (s=src; s && *s; s++, dest++) {
if (*s == '\\') s++; if (*s == '\\') s++;
*dest = *s; *dest = *s;
} }
@ -1482,6 +1482,8 @@ int reserved_word(o_string *dest, struct p_context *ctx)
{ "done", RES_DONE, FLAG_END } { "done", RES_DONE, FLAG_END }
}; };
struct reserved_combo *r; struct reserved_combo *r;
if (dest->data == NULL)
return 0;
for (r=reserved_list; for (r=reserved_list;
#define NRES sizeof(reserved_list)/sizeof(struct reserved_combo) #define NRES sizeof(reserved_list)/sizeof(struct reserved_combo)
r<reserved_list+NRES; r++) { r<reserved_list+NRES; r++) {

6
shell/hush.c
View File

@ -1298,7 +1298,7 @@ static int globhack(const char *src, int flags, glob_t *pglob)
int cnt, pathc; int cnt, pathc;
const char *s; const char *s;
char *dest; char *dest;
for (cnt=1, s=src; *s; s++) { for (cnt=1, s=src; s && *s; s++) {
if (*s == '\\') s++; if (*s == '\\') s++;
cnt++; cnt++;
} }
@ -1315,7 +1315,7 @@ static int globhack(const char *src, int flags, glob_t *pglob)
if (pglob->gl_pathv == NULL) return GLOB_NOSPACE; if (pglob->gl_pathv == NULL) return GLOB_NOSPACE;
pglob->gl_pathv[pathc-1]=dest; pglob->gl_pathv[pathc-1]=dest;
pglob->gl_pathv[pathc]=NULL; pglob->gl_pathv[pathc]=NULL;
for (s=src; *s; s++, dest++) { for (s=src; s && *s; s++, dest++) {
if (*s == '\\') s++; if (*s == '\\') s++;
*dest = *s; *dest = *s;
} }
@ -1482,6 +1482,8 @@ int reserved_word(o_string *dest, struct p_context *ctx)
{ "done", RES_DONE, FLAG_END } { "done", RES_DONE, FLAG_END }
}; };
struct reserved_combo *r; struct reserved_combo *r;
if (dest->data == NULL)
return 0;
for (r=reserved_list; for (r=reserved_list;
#define NRES sizeof(reserved_list)/sizeof(struct reserved_combo) #define NRES sizeof(reserved_list)/sizeof(struct reserved_combo)
r<reserved_list+NRES; r++) { r<reserved_list+NRES; r++) {