diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2012-03-13 15:11:02 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2012-03-13 15:11:02 -0400 |
| commit | 952a575888196bfabdf31665325633891c2968f3 (patch) | |
| tree | 0aa7f54f30f047691241bb446b7ada8e062cc799 | |
| parent | 42a5896e24b901eeb849e4b01c0a721c981b65fd (diff) | |
| download | android_external_bash-952a575888196bfabdf31665325633891c2968f3.tar.gz android_external_bash-952a575888196bfabdf31665325633891c2968f3.tar.bz2 android_external_bash-952a575888196bfabdf31665325633891c2968f3.zip | |
Bash-4.2 patch 21
| -rw-r--r-- | builtins/read.def | 4 | ||||
| -rw-r--r-- | 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_ */ |