LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bash-4.3 patch 9

Browse Source
This commit is contained in:
Chet Ramey
2014-04-11 11:04:26 -04:00
parent 7137b2df58
commit 6ebbb24a5c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parse.y
View File

@@ -2424,7 +2424,7 @@ shell_getc (remove_quoted_newline)
not already end in an EOF character. */ not already end in an EOF character. */
if (shell_input_line_terminator != EOF) if (shell_input_line_terminator != EOF)
{ {
if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3) if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
shell_input_line = (char *)xrealloc (shell_input_line, shell_input_line = (char *)xrealloc (shell_input_line,
1 + (shell_input_line_size += 2)); 1 + (shell_input_line_size += 2));

2
patchlevel.h
View File

@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 8 #define PATCHLEVEL 9
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */

2
y.tab.c
View File

@@ -4736,7 +4736,7 @@ shell_getc (remove_quoted_newline)
not already end in an EOF character. */ not already end in an EOF character. */
if (shell_input_line_terminator != EOF) if (shell_input_line_terminator != EOF)
{ {
if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3) if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
shell_input_line = (char *)xrealloc (shell_input_line, shell_input_line = (char *)xrealloc (shell_input_line,
1 + (shell_input_line_size += 2)); 1 + (shell_input_line_size += 2));