From 8ddc8d6e3a3d85eec6d4ba9b9ed2bc36bce56716 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Mon, 14 Nov 2016 14:26:51 -0500 Subject: [PATCH] Bash-4.4 patch 1 --- lib/readline/history.c | 6 +++++- patchlevel.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/readline/history.c b/lib/readline/history.c index 3b8dbc5..9ff25a7 100644 --- a/lib/readline/history.c +++ b/lib/readline/history.c @@ -57,6 +57,8 @@ extern int errno; /* How big to make the_history when we first allocate it. */ #define DEFAULT_HISTORY_INITIAL_SIZE 502 +#define MAX_HISTORY_INITIAL_SIZE 8192 + /* The number of slots to increase the_history by. */ #define DEFAULT_HISTORY_GROW_SIZE 50 @@ -307,7 +309,9 @@ add_history (string) if (history_size == 0) { if (history_stifled && history_max_entries > 0) - history_size = history_max_entries + 2; + history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE) + ? MAX_HISTORY_INITIAL_SIZE + : history_max_entries + 2; else history_size = DEFAULT_HISTORY_INITIAL_SIZE; the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *)); diff --git a/patchlevel.h b/patchlevel.h index 1cd7c96..40db1a3 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 0 +#define PATCHLEVEL 1 #endif /* _PATCHLEVEL_H_ */ -- 2.9.3