mirrors/make-dfsg
1
0
Fork 0
mirror of https://salsa.debian.org/srivasta/make-dfsg.git synced 2025-01-05 03:50:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep the command line on the heap to avoid stack overflow.

Browse source 
Fixes Savannah bug #36451.
This commit is contained in:
Paul Smith 2012-09-09 23:25:07 +00:00
parent b9c4a38022
commit a94b0b0ea5
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2012-09-09 Paul Smith <psmith@gnu.org>
* job.c (construct_command_argv_internal): Keep the command line
on the heap for very long lines. Fixes Savannah bug #36451.
* function.c (func_realpath): BSD realpath(3) doesn't fail if the
file does not exist: use stat. Fixes Savannah bug #35919.

13
job.c
View file

@ -2984,8 +2984,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
return new_argv;
}
new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
+ (line_len*2) + 1);
new_line = xmalloc ((shell_len*2) + 1 + sflags_len + 1
+ (line_len*2) + 1);
ap = new_line;
/* Copy SHELL, escaping any characters special to the shell. If
we don't escape them, construct_command_argv_internal will
@ -3052,8 +3052,11 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
*ap++ = *p;
}
if (ap == new_line + shell_len + sflags_len + 2)
/* Line was empty. */
return 0;
{
/* Line was empty. */
free (new_line);
return 0;
}
*ap = '\0';
#ifdef WINDOWS32
@ -3194,6 +3197,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
fatal (NILF, _("%s (line %d) Bad shell context (!unixy && !batch_mode_shell)\n"),
__FILE__, __LINE__);
#endif
free (new_line);
}
#endif /* ! AMIGA */