From 4c944910fabeb2084c93a42425aa358cb1ccd294 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 9 Aug 2009 17:52:54 +0000 Subject: [PATCH] Sync OpenBSD patchset 232: Use a temporary variable for strdup of const char *. --- environ.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/environ.c b/environ.c index 7111ebb5..d43f9b0e 100644 --- a/environ.c +++ b/environ.c @@ -1,4 +1,4 @@ -/* $Id: environ.c,v 1.1 2009-08-09 17:48:55 tcunha Exp $ */ +/* $Id: environ.c,v 1.2 2009-08-09 17:52:54 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -134,14 +134,14 @@ void environ_update(const char *vars, struct environ *srcenv, struct environ *dstenv) { struct environ_entry *envent; - char *var, *next; + char *copyvars, *var, *next; - vars = next = xstrdup(vars); + copyvars = next = xstrdup(vars); while ((var = strsep(&next, " ")) != NULL) { if ((envent = environ_find(srcenv, var)) == NULL) environ_set(dstenv, var, NULL); else environ_set(dstenv, envent->name, envent->value); } - xfree(vars); + xfree(copyvars); }