view lib/putenv.c @ 17329:a72ac603a92f

putenv: fix heap corruption with mixed putenv/_putenv Problem reported by Michael Goffioul in <http://lists.gnu.org/archive/html/bug-gnulib/2013-02/msg00061.html>. * lib/putenv.c (putenv) [HAVE__PUTENV]: Rely on _putenv to allocate the new environment. * m4/putenv.m4 (gl_PREREQ_PUTENV): New macro. * modules/putenv (configure.ac): Use it.
author Paul Eggert <eggert@cs.ucla.edu>
date Thu, 14 Feb 2013 13:14:18 -0800
parents e542fd46ad6f
children cec099cbf54f
line wrap: on
line source

/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2013 Free Software
   Foundation, Inc.

   NOTE: The canonical source of this file is maintained with the GNU C
   Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.

   This program is free software: you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the
   Free Software Foundation; either version 3 of the License, or any
   later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

#include <config.h>

/* Specification.  */
#include <stdlib.h>

#include <stddef.h>

/* Include errno.h *after* sys/types.h to work around header problems
   on AIX 3.2.5.  */
#include <errno.h>
#ifndef __set_errno
# define __set_errno(ev) ((errno) = (ev))
#endif

#include <string.h>
#include <unistd.h>

#if _LIBC
# if HAVE_GNU_LD
#  define environ __environ
# else
extern char **environ;
# endif
#endif

#if _LIBC
/* This lock protects against simultaneous modifications of 'environ'.  */
# include <bits/libc-lock.h>
__libc_lock_define_initialized (static, envlock)
# define LOCK   __libc_lock_lock (envlock)
# define UNLOCK __libc_lock_unlock (envlock)
#else
# define LOCK
# define UNLOCK
#endif

static int
_unsetenv (const char *name)
{
  size_t len;
  char **ep;

  if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
    {
      __set_errno (EINVAL);
      return -1;
    }

  len = strlen (name);

  LOCK;

  ep = environ;
  while (*ep != NULL)
    if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
      {
        /* Found it.  Remove this pointer by moving later ones back.  */
        char **dp = ep;

        do
          dp[0] = dp[1];
        while (*dp++);
        /* Continue the loop in case NAME appears again.  */
      }
    else
      ++ep;

  UNLOCK;

  return 0;
}


/* Put STRING, which is of the form "NAME=VALUE", in the environment.
   If STRING contains no '=', then remove STRING from the environment.  */
int
putenv (char *string)
{
  const char *const name_end = strchr (string, '=');
  register size_t size;
  register char **ep;

  if (name_end == NULL)
    {
      /* Remove the variable from the environment.  */
      return _unsetenv (string);
    }

  size = 0;
  for (ep = environ; *ep != NULL; ++ep)
    if (!strncmp (*ep, string, name_end - string) &&
        (*ep)[name_end - string] == '=')
      break;
    else
      ++size;

  if (*ep == NULL)
    {
#if HAVE__PUTENV
      /* Rely on _putenv to allocate the new environment.  If other
         parts of the application use _putenv, the !HAVE__PUTENV code
         would fight over who owns the environ vector, causing a crash.  */
      if (name_end[1])
        return _putenv (string);
      else
        {
          /* _putenv ("NAME=") unsets NAME, so invoke _putenv ("NAME=x")
             to allocate the environ vector and then replace the new
             entry with "NAME=".  */
          int putenv_result, putenv_errno;
          char *name_x = malloc (name_end - string + sizeof "=x");
          if (!name_x)
            return -1;
          memcpy (name_x, string, name_end - string + 1);
          name_x[name_end - string + 1] = 'x';
          name_x[name_end - string + 2] = 0;
          putenv_result = _putenv (name_x);
          putenv_errno = errno;
          for (ep = environ; *ep; ep++)
            if (*ep == name_x)
              {
                *ep = string;
                break;
              }
          free (name_x);
          __set_errno (putenv_errno);
          return putenv_result;
        }
#else
      static char **last_environ = NULL;
      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
      if (new_environ == NULL)
        return -1;
      (void) memcpy ((void *) new_environ, (void *) environ,
                     size * sizeof (char *));
      new_environ[size] = (char *) string;
      new_environ[size + 1] = NULL;
      free (last_environ);
      last_environ = new_environ;
      environ = new_environ;
#endif
    }
  else
    *ep = string;

  return 0;
}