diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2015-05-19 14:55:37 -0400 |
|---|---|---|
| committer | Tom Powell <zifnab@zifnab06.net> | 2015-10-08 20:52:34 -0700 |
| commit | 91d67da8d4a1403cab5fe63dc555880b64a80061 (patch) | |
| tree | 43a4a4683e6f823dac439e6c365458569b1e0c18 | |
| parent | 0bfa50e5e4afcdb89cc07dbeaf43201412416023 (diff) | |
| download | android_external_bash-91d67da8d4a1403cab5fe63dc555880b64a80061.tar.gz android_external_bash-91d67da8d4a1403cab5fe63dc555880b64a80061.tar.bz2 android_external_bash-91d67da8d4a1403cab5fe63dc555880b64a80061.zip | |
Bash-4.3 patch 36
Change-Id: I1aac05a3a8379b443a960a248db390f05ea68f8a
| -rw-r--r-- | patchlevel.h | 2 | ||||
| -rw-r--r-- | variables.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/patchlevel.h b/patchlevel.h index f457723..04f2973 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 35 +#define PATCHLEVEL 36 #endif /* _PATCHLEVEL_H_ */ diff --git a/variables.c b/variables.c index 1f7be5e..f39eb64 100644 --- a/variables.c +++ b/variables.c @@ -2833,10 +2833,12 @@ bind_int_variable (lhs, rhs) #endif v = bind_variable (lhs, rhs, 0); - if (v && isint) - VSETATTR (v, att_integer); - - VUNSETATTR (v, att_invisible); + if (v) + { + if (isint) + VSETATTR (v, att_integer); + VUNSETATTR (v, att_invisible); + } return (v); } |