author | Stefan Teleman <stefan.teleman@oracle.com> |
Fri, 26 Sep 2014 07:32:09 -0700 | |
branch | s11u2-sru |
changeset 3346 | 0e90925e4557 |
permissions | -rw-r--r-- |
3346
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
# Patch Origin: http://www.openwall.com/lists/oss-security/2014/09/25/32 |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
# Patch is from Red Hat Security. |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
# CVE-2014-7619 |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
# CVSS Score:10.0 |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
# This is an update to the previously released patchset for the same |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
# vulnerability. The previous patch did NOT cover all possible attack |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
# vectors. |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
--- ../bash-4.1.orig/variables.c 2014-09-25 08:10:49.920709400 -0700 |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
+++ variables.c 2014-09-25 11:59:38.642742000 -0700 |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
@@ -268,7 +268,7 @@ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
static void propagate_temp_var __P((PTR_T)); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
static void dispose_temporary_env __P((sh_free_func_t *)); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
-static inline char *mk_env_string __P((const char *, const char *)); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
+static inline char *mk_env_string __P((const char *, const char *, int)); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
static char **make_env_array_from_var_list __P((SHELL_VAR **)); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
static char **make_var_export_array __P((VAR_CONTEXT *)); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
static char **make_func_export_array __P((void)); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
@@ -301,6 +301,14 @@ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
#endif |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
} |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
+/* Prefix and suffix for environment variable names which contain |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
+ shell functions. */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
+#define FUNCDEF_PREFIX "BASH_FUNC_" |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
+#define FUNCDEF_PREFIX_LEN (strlen (FUNCDEF_PREFIX)) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
+#define FUNCDEF_SUFFIX "()" |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
+#define FUNCDEF_SUFFIX_LEN (strlen (FUNCDEF_SUFFIX)) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
+ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
30 |
+ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
31 |
/* Initialize the shell variables from the current environment. |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
32 |
If PRIVMODE is nonzero, don't import functions from ENV or |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
33 |
parse $SHELLOPTS. */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
34 |
@@ -338,27 +346,39 @@ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
35 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
36 |
/* If exported function, define it now. Don't import functions from |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
37 |
the environment in privileged mode. */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
38 |
- if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4)) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
39 |
- { |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
40 |
- string_length = strlen (string); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
41 |
- temp_string = (char *)xmalloc (3 + string_length + char_index); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
42 |
+ if (privmode == 0 && read_but_dont_execute == 0 |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
43 |
+ && STREQN (FUNCDEF_PREFIX, name, FUNCDEF_PREFIX_LEN) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
44 |
+ && STREQ (name + char_index - FUNCDEF_SUFFIX_LEN, FUNCDEF_SUFFIX) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
45 |
+ && STREQN ("() {", string, 4)) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
46 |
+ { |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
47 |
+ size_t name_length |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
48 |
+ = char_index - (FUNCDEF_PREFIX_LEN + FUNCDEF_SUFFIX_LEN); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
49 |
+ char *temp_name = name + FUNCDEF_PREFIX_LEN; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
50 |
+ /* Temporarily remove the suffix. */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
51 |
+ temp_name[name_length] = '\0'; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
52 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
53 |
- strcpy (temp_string, name); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
54 |
- temp_string[char_index] = ' '; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
55 |
- strcpy (temp_string + char_index + 1, string); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
56 |
+ string_length = strlen (string); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
57 |
+ temp_string = (char *)xmalloc (name_length + 1 + string_length + 1); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
58 |
+ memcpy (temp_string, temp_name, name_length); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
59 |
+ temp_string[name_length] = ' '; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
60 |
+ memcpy (temp_string + name_length + 1, string, string_length + 1); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
61 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
62 |
/* Don't import function names that are invalid identifiers from the |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
63 |
environment. */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
64 |
- if (legal_identifier (name)) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
65 |
- parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
66 |
+ if (legal_identifier (temp_name)) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
67 |
+ parse_and_execute (temp_string, temp_name, |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
68 |
+ SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
69 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
70 |
- if (temp_var = find_function (name)) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
71 |
+ if (temp_var = find_function (temp_name)) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
72 |
{ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
73 |
VSETATTR (temp_var, (att_exported|att_imported)); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
74 |
array_needs_making = 1; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
75 |
} |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
76 |
else |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
77 |
report_error (_("error importing function definition for `%s'"), name); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
78 |
+ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
79 |
+ /* Restore the original suffix. */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
80 |
+ temp_name[name_length] = FUNCDEF_SUFFIX[0]; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
81 |
} |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
82 |
#if defined (ARRAY_VARS) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
83 |
# if 0 |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
84 |
@@ -2515,7 +2535,7 @@ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
85 |
var->context = variable_context; /* XXX */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
86 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
87 |
INVALIDATE_EXPORTSTR (var); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
88 |
- var->exportstr = mk_env_string (name, value); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
89 |
+ var->exportstr = mk_env_string (name, value, 0); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
90 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
91 |
array_needs_making = 1; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
92 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
93 |
@@ -3333,22 +3353,43 @@ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
94 |
/* */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
95 |
/* **************************************************************** */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
96 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
97 |
+/* Returns the string NAME=VALUE if !FUNCTIONP or if VALUE == NULL (in |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
98 |
+ which case it is treated as empty). Otherwise, decorate NAME with |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
99 |
+ FUNCDEF_PREFIX and FUNCDEF_SUFFIX, and return a string of the form |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
100 |
+ FUNCDEF_PREFIX NAME FUNCDEF_SUFFIX = VALUE (without spaces). */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
101 |
static inline char * |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
102 |
-mk_env_string (name, value) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
103 |
+mk_env_string (name, value, functionp) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
104 |
const char *name, *value; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
105 |
+ int functionp; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
106 |
{ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
107 |
- int name_len, value_len; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
108 |
- char *p; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
109 |
+ size_t name_len, value_len; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
110 |
+ char *p, *q; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
111 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
112 |
name_len = strlen (name); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
113 |
value_len = STRLEN (value); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
114 |
- p = (char *)xmalloc (2 + name_len + value_len); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
115 |
- strcpy (p, name); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
116 |
- p[name_len] = '='; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
117 |
+ if (functionp && value != NULL) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
118 |
+ { |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
119 |
+ p = (char *)xmalloc (FUNCDEF_PREFIX_LEN + name_len + FUNCDEF_SUFFIX_LEN |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
120 |
+ + 1 + value_len + 1); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
121 |
+ q = p; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
122 |
+ memcpy (q, FUNCDEF_PREFIX, FUNCDEF_PREFIX_LEN); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
123 |
+ q += FUNCDEF_PREFIX_LEN; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
124 |
+ memcpy (q, name, name_len); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
125 |
+ q += name_len; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
126 |
+ memcpy (q, FUNCDEF_SUFFIX, FUNCDEF_SUFFIX_LEN); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
127 |
+ q += FUNCDEF_SUFFIX_LEN; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
128 |
+ } |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
129 |
+ else |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
130 |
+ { |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
131 |
+ p = (char *)xmalloc (name_len + 1 + value_len + 1); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
132 |
+ memcpy (p, name, name_len); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
133 |
+ q = p + name_len; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
134 |
+ } |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
135 |
+ q[0] = '='; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
136 |
if (value && *value) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
137 |
- strcpy (p + name_len + 1, value); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
138 |
+ memcpy (q + 1, value, value_len + 1); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
139 |
else |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
140 |
- p[name_len + 1] = '\0'; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
141 |
+ q[1] = '\0'; |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
142 |
return (p); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
143 |
} |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
144 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
145 |
@@ -3434,7 +3475,7 @@ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
146 |
/* Gee, I'd like to get away with not using savestring() if we're |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
147 |
using the cached exportstr... */ |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
148 |
list[list_index] = USE_EXPORTSTR ? savestring (value) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
149 |
- : mk_env_string (var->name, value); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
150 |
+ : mk_env_string (var->name, value, function_p (var)); |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
151 |
|
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
152 |
if (USE_EXPORTSTR == 0) |
0e90925e4557
19690348 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
153 |
SAVE_EXPORTSTR (var, list[list_index]); |