aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2014-04-11 11:04:26 -0400
committerChet Ramey <chet.ramey@case.edu>2014-04-11 11:04:26 -0400
commit6ebbb24a5cc6e798e3c8f75e8617908b93a37d65 (patch)
treef674cd3bdab43af6a84d20842ab1f41bf30a71f9
parent7137b2df58b6506ccae6efa9a13be467e87efc4f (diff)
downloadandroid_external_bash-6ebbb24a5cc6e798e3c8f75e8617908b93a37d65.tar.gz
android_external_bash-6ebbb24a5cc6e798e3c8f75e8617908b93a37d65.tar.bz2
android_external_bash-6ebbb24a5cc6e798e3c8f75e8617908b93a37d65.zip
Bash-4.3 patch 9
-rw-r--r--parse.y2
-rw-r--r--patchlevel.h2
-rw-r--r--y.tab.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/parse.y b/parse.y
index 83d5b9f..91bf3bf 100644
--- a/parse.y
+++ b/parse.y
@@ -2424,7 +2424,7 @@ shell_getc (remove_quoted_newline)
not already end in an EOF character. */
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,
1 + (shell_input_line_size += 2));
diff --git a/patchlevel.h b/patchlevel.h
index 4099c48..2860f13 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 8
+#define PATCHLEVEL 9
#endif /* _PATCHLEVEL_H_ */
diff --git a/y.tab.c b/y.tab.c
index 709a56a..80fe930 100644
--- a/y.tab.c
+++ b/y.tab.c
@@ -4736,7 +4736,7 @@ shell_getc (remove_quoted_newline)
not already end in an EOF character. */
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,
1 + (shell_input_line_size += 2));