From 952a575888196bfabdf31665325633891c2968f3 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Tue, 13 Mar 2012 15:11:02 -0400 Subject: [PATCH] Bash-4.2 patch 21 --- builtins/read.def | 4 ++-- patchlevel.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtins/read.def b/builtins/read.def index 1b87faa..4915220 100644 --- a/builtins/read.def +++ b/builtins/read.def @@ -737,7 +737,7 @@ assign_vars: xfree (t1); } else - var = bind_read_variable (varname, t); + var = bind_read_variable (varname, t ? t : ""); } else { @@ -798,7 +798,7 @@ assign_vars: xfree (t); } else - var = bind_read_variable (list->word->word, input_string); + var = bind_read_variable (list->word->word, input_string ? input_string : ""); if (var) { diff --git a/patchlevel.h b/patchlevel.h index cb416d3..2ffa36e 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 20 +#define PATCHLEVEL 21 #endif /* _PATCHLEVEL_H_ */ -- 2.7.4