From: Chet Ramey <chet.ramey@case.edu>
Date: Tue, 13 Mar 2012 19:11:02 +0000 (-0400)
Subject: Bash-4.2 patch 21
X-Git-Tag: bash-4.3~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=952a575888196bfabdf31665325633891c2968f3;p=thirdparty%2Fbash.git

Bash-4.2 patch 21
---

diff --git a/builtins/read.def b/builtins/read.def
index 1b87faaef..4915220c3 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 cb416d345..2ffa36e67 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_ */