summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2011-11-22 20:00:31 -0500
committerChet Ramey <chet.ramey@case.edu>2011-11-22 20:00:31 -0500
commiteafc91a3506a082956fbdc8f0fb1210d00f1e035 (patch)
treea8c21e70d66fb14869ebeab1cc58be6aff85053d
parent2bbe80583bb601cdca730a4aafebb5622b6dddc1 (diff)
downloadbash-eafc91a3506a082956fbdc8f0fb1210d00f1e035.tar.gz
Bash-4.2 patch 6
-rw-r--r--patchlevel.h2
-rw-r--r--variables.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/patchlevel.h b/patchlevel.h
index 5cca30b8..2a6db0eb 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 5
+#define PATCHLEVEL 6
#endif /* _PATCHLEVEL_H_ */
diff --git a/variables.c b/variables.c
index daacdbf0..7bb850fa 100644
--- a/variables.c
+++ b/variables.c
@@ -3660,7 +3660,7 @@ chkexport (name)
SHELL_VAR *v;
v = find_variable (name);
- if (exported_p (v))
+ if (v && exported_p (v))
{
array_needs_making = 1;
maybe_make_export_env ();