[BACK]Return to alloc.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo / common

Diff for /embedaddon/sudo/common/alloc.c between versions 1.1.1.3 and 1.1.1.6

version 1.1.1.3, 2012/10/09 09:29:52 version 1.1.1.6, 2014/06/15 16:12:54
Line 1 Line 1
 /*  /*
 * Copyright (c) 1999-2005, 2007, 2010-2011 * Copyright (c) 1999-2005, 2007, 2010-2013
  *      Todd C. Miller <Todd.Miller@courtesan.com>   *      Todd C. Miller <Todd.Miller@courtesan.com>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
Line 22 Line 22
 #include <config.h>  #include <config.h>
   
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/param.h>  
 #include <stdio.h>  #include <stdio.h>
 #ifdef STDC_HEADERS  #ifdef STDC_HEADERS
 # include <stdlib.h>  # include <stdlib.h>
Line 47 Line 46
 #ifdef HAVE_INTTYPES_H  #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>  # include <inttypes.h>
 #endif  #endif
   #include <limits.h>
   
   #define DEFAULT_TEXT_DOMAIN     "sudo"
   #include "gettext.h"            /* must be included before missing.h */
   
 #include "missing.h"  #include "missing.h"
 #include "alloc.h"  #include "alloc.h"
#include "error.h"#include "fatal.h"
   
 #define DEFAULT_TEXT_DOMAIN     "sudo"  
 #include "gettext.h"  
   
 /*  /*
  * If there is no SIZE_MAX or SIZE_T_MAX we have to assume that size_t   * If there is no SIZE_MAX or SIZE_T_MAX we have to assume that size_t
  * could be signed (as it is on SunOS 4.x).  This just means that   * could be signed (as it is on SunOS 4.x).  This just means that
Line 79  emalloc(size_t size) Line 79  emalloc(size_t size)
     void *ptr;      void *ptr;
   
     if (size == 0)      if (size == 0)
        errorx2(1, _("internal error, tried to emalloc(0)"));        fatalx_nodebug(_("internal error, tried to emalloc(0)"));
   
     if ((ptr = malloc(size)) == NULL)      if ((ptr = malloc(size)) == NULL)
        errorx2(1, _("unable to allocate memory"));        fatal_nodebug(NULL);
     return ptr;      return ptr;
 }  }
   
Line 96  emalloc2(size_t nmemb, size_t size) Line 96  emalloc2(size_t nmemb, size_t size)
     void *ptr;      void *ptr;
   
     if (nmemb == 0 || size == 0)      if (nmemb == 0 || size == 0)
        errorx2(1, _("internal error, tried to emalloc2(0)"));        fatalx_nodebug(_("internal error, tried to emalloc2(0)"));
     if (nmemb > SIZE_MAX / size)      if (nmemb > SIZE_MAX / size)
        errorx2(1, _("internal error, %s overflow"), "emalloc2()");        fatalx_nodebug(_("internal error, %s overflow"), "emalloc2()");
   
     size *= nmemb;      size *= nmemb;
     if ((ptr = malloc(size)) == NULL)      if ((ptr = malloc(size)) == NULL)
        errorx2(1, _("unable to allocate memory"));        fatal_nodebug(NULL);
     return ptr;      return ptr;
 }  }
   
Line 117  ecalloc(size_t nmemb, size_t size) Line 117  ecalloc(size_t nmemb, size_t size)
     void *ptr;      void *ptr;
   
     if (nmemb == 0 || size == 0)      if (nmemb == 0 || size == 0)
        errorx2(1, _("internal error, tried to ecalloc(0)"));        fatalx_nodebug(_("internal error, tried to ecalloc(0)"));
     if (nmemb != 1) {      if (nmemb != 1) {
         if (nmemb > SIZE_MAX / size)          if (nmemb > SIZE_MAX / size)
            errorx2(1, _("internal error, %s overflow"), "ecalloc()");            fatalx_nodebug(_("internal error, %s overflow"), "ecalloc()");
         size *= nmemb;          size *= nmemb;
     }      }
     if ((ptr = malloc(size)) == NULL)      if ((ptr = malloc(size)) == NULL)
        errorx2(1, _("unable to allocate memory"));        fatal_nodebug(NULL);
     memset(ptr, 0, size);      memset(ptr, 0, size);
     return ptr;      return ptr;
 }  }
Line 139  erealloc(void *ptr, size_t size) Line 139  erealloc(void *ptr, size_t size)
 {  {
   
     if (size == 0)      if (size == 0)
        errorx2(1, _("internal error, tried to erealloc(0)"));        fatalx_nodebug(_("internal error, tried to erealloc(0)"));
   
     ptr = ptr ? realloc(ptr, size) : malloc(size);      ptr = ptr ? realloc(ptr, size) : malloc(size);
     if (ptr == NULL)      if (ptr == NULL)
        errorx2(1, _("unable to allocate memory"));        fatal_nodebug(NULL);
     return ptr;      return ptr;
 }  }
   
Line 158  erealloc3(void *ptr, size_t nmemb, size_t size) Line 158  erealloc3(void *ptr, size_t nmemb, size_t size)
 {  {
   
     if (nmemb == 0 || size == 0)      if (nmemb == 0 || size == 0)
        errorx2(1, _("internal error, tried to erealloc3(0)"));        fatalx_nodebug(_("internal error, tried to erealloc3(0)"));
     if (nmemb > SIZE_MAX / size)      if (nmemb > SIZE_MAX / size)
        errorx2(1, _("internal error, %s overflow"), "erealloc3()");        fatalx_nodebug(_("internal error, %s overflow"), "erealloc3()");
   
     size *= nmemb;      size *= nmemb;
     ptr = ptr ? realloc(ptr, size) : malloc(size);      ptr = ptr ? realloc(ptr, size) : malloc(size);
     if (ptr == NULL)      if (ptr == NULL)
        errorx2(1, _("unable to allocate memory"));        fatal_nodebug(NULL);
     return ptr;      return ptr;
 }  }
   
 #ifdef notyet  
 /*  /*
  * erecalloc() realloc(3)s nmemb * msize bytes and exits with an error   * erecalloc() realloc(3)s nmemb * msize bytes and exits with an error
  * if overflow would occur or if the system malloc(3)/realloc(3) fails.   * if overflow would occur or if the system malloc(3)/realloc(3) fails.
 * On success, the new space is zero-filled.  You can call ereallocz() * On success, the new space is zero-filled.  You can call erealloc()
  * with a NULL pointer even if the system realloc(3) does not support this.   * with a NULL pointer even if the system realloc(3) does not support this.
  */   */
 void *  void *
Line 182  erecalloc(void *ptr, size_t onmemb, size_t nmemb, size Line 181  erecalloc(void *ptr, size_t onmemb, size_t nmemb, size
     size_t size;      size_t size;
   
     if (nmemb == 0 || msize == 0)      if (nmemb == 0 || msize == 0)
        errorx2(1, _("internal error, tried to erecalloc(0)"));        fatalx_nodebug(_("internal error, tried to erecalloc(0)"));
     if (nmemb > SIZE_MAX / msize)      if (nmemb > SIZE_MAX / msize)
        errorx2(1, _("internal error, %s overflow"), "erecalloc()");        fatalx_nodebug(_("internal error, %s overflow"), "erecalloc()");
   
     size = nmemb * msize;      size = nmemb * msize;
     ptr = ptr ? realloc(ptr, size) : malloc(size);      ptr = ptr ? realloc(ptr, size) : malloc(size);
     if (ptr == NULL)      if (ptr == NULL)
        errorx2(1, _("unable to allocate memory"));        fatal_nodebug(NULL);
     if (nmemb > onmemb) {      if (nmemb > onmemb) {
         size = (nmemb - onmemb) * msize;          size = (nmemb - onmemb) * msize;
         memset((char *)ptr + (onmemb * msize), 0, size);          memset((char *)ptr + (onmemb * msize), 0, size);
     }      }
     return ptr;      return ptr;
 }  }
 #endif  
   
 /*  /*
  * estrdup() is like strdup(3) except that it exits with an error if   * estrdup() is like strdup(3) except that it exits with an error if
Line 248  easprintf(char **ret, const char *fmt, ...) Line 246  easprintf(char **ret, const char *fmt, ...)
 {  {
     int len;      int len;
     va_list ap;      va_list ap;
   
     va_start(ap, fmt);      va_start(ap, fmt);
     len = vasprintf(ret, fmt, ap);      len = vasprintf(ret, fmt, ap);
     va_end(ap);      va_end(ap);
   
     if (len == -1)      if (len == -1)
        errorx2(1, _("unable to allocate memory"));        fatal_nodebug(NULL);
     return len;      return len;
 }  }
   
Line 267  evasprintf(char **ret, const char *format, va_list arg Line 266  evasprintf(char **ret, const char *format, va_list arg
     int len;      int len;
   
     if ((len = vasprintf(ret, format, args)) == -1)      if ((len = vasprintf(ret, format, args)) == -1)
        errorx2(1, _("unable to allocate memory"));        fatal_nodebug(NULL);
     return len;      return len;
 }  
   
 /*  
  * Wrapper for free(3) so we can depend on C89 semantics.  
  */  
 void  
 efree(void *ptr)  
 {  
     if (ptr != NULL)  
         free(ptr);  
 }  }
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.6

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>