fix ENV{TEST}="Test: $env{TEST}"

[elogind.git] / udev_rules.c

diff --git a/udev_rules.c b/udev_rules.c
index 267c79de03936d4509b1b9c8a42d15dd6ca7e7c3..1483f8f4930d50b0d62d2c2a594b1a31f38353c2 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -1,6 +1,4 @@
 /*
- * udev_rules.c
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
  * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
@@ -15,7 +13,7 @@
  *
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -804,13 +802,19 @@ try_parent:
                struct key_pair *pair = &rule->env.keys[i];
 
                if (pair->key.operation == KEY_OP_ASSIGN) {
+                       char temp_value[NAME_SIZE];
                        const char *key_name = key_pair_name(rule, pair);
                        const char *value = key_val(rule, &pair->key);
-                       char *key_value = name_list_key_add(&udev->env_list, key_name, value);
+                       char *key_value;
+
+                       /* make sure we don't write to the same string we possibly read from */
+                       strlcpy(temp_value, value, sizeof(temp_value));
+                       udev_rules_apply_format(udev, temp_value, NAME_SIZE);
+
+                       key_value = name_list_key_add(&udev->env_list, key_name, temp_value);
                        if (key_value == NULL)
                                break;
 
-                       udev_rules_apply_format(udev, key_value, NAME_SIZE);
                        putenv(key_value);
                        dbg("export ENV '%s'", key_value);
                }