d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a panic which could occur parsing #!-lines in a shell-script. If the

Browse Source 
#!-line had multiple whitespace characters after the interpreter name, and
it did not have any options, then the code would do nasty things trying to
process a (non-existent) option-string which "ended before it began"...

Submitted by:	Morten Johansen
Approved by:	re (dwhite)
This commit is contained in:
Garance A Drosehn 2005-06-19 02:21:03 +00:00
parent b770ff6eb2
commit bd3aace7e4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/imgact_shell.c
View File

@ -161,7 +161,7 @@ exec_shell_imgact(imgp)
while (ihp < maxp && ((*ihp != '\n') && (*ihp != '\0')))
ihp++;
opte = ihp;
while (--ihp > interpe && ((*ihp == ' ') || (*ihp == '\t')))
while (--ihp > optb && ((*ihp == ' ') || (*ihp == '\t')))
opte = ihp;
/*
@ -173,7 +173,7 @@ exec_shell_imgact(imgp)
* area, and 'length' as the number of bytes being removed.
*/
offset = interpe - interpb + 1; /* interpreter */
if (opte != optb) /* options (if any) */
if (opte > optb) /* options (if any) */
offset += opte - optb + 1;
offset += strlen(imgp->args->fname) + 1; /* fname of script */
length = (imgp->args->argc == 0) ? 0 :
@ -208,7 +208,7 @@ exec_shell_imgact(imgp)
bcopy(interpb, imgp->args->buf, length);
*(imgp->args->buf + length) = '\0';
offset = length + 1;
if (opte != optb) {
if (opte > optb) {
length = opte - optb;
bcopy(optb, imgp->args->buf + offset, length);
*(imgp->args->buf + offset + length) = '\0';