From: Todd C. Miller Date: Wed, 17 Jun 2015 23:00:55 +0000 (-0600) Subject: Remove now-unused sudo_alloc.h and alloc.c X-Git-Tag: SUDO_1_8_14^2~79 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4be97a6c4e52c011bb3ac619197c29040a3ea131;p=sudo Remove now-unused sudo_alloc.h and alloc.c --- diff --git a/MANIFEST b/MANIFEST index d16ed2ba0..1eeb85cc3 100644 --- a/MANIFEST +++ b/MANIFEST @@ -61,7 +61,6 @@ include/compat/nss_dbdefs.h include/compat/sha2.h include/compat/stdbool.h include/compat/timespec.h -include/sudo_alloc.h include/sudo_compat.h include/sudo_conf.h include/sudo_debug.h @@ -80,7 +79,6 @@ init.d/sudo.conf.in install-sh lib/util/Makefile.in lib/util/aix.c -lib/util/alloc.c lib/util/closefrom.c lib/util/event.c lib/util/event_poll.c diff --git a/include/sudo_alloc.h b/include/sudo_alloc.h deleted file mode 100644 index 1ea8b4b4d..000000000 --- a/include/sudo_alloc.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2009-2010, 2012-1014 - * Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef SUDO_ALLOC_H -#define SUDO_ALLOC_H - -#include - -#undef sudo_efree -#define sudo_efree(x) free((void *)(x)) - -__dso_public int sudo_easprintf_v1(char **ret, const char *fmt, ...) __printflike(2, 3); -__dso_public int sudo_evasprintf_v1(char **ret, const char *fmt, va_list) __printflike(2, 0); -__dso_public void *sudo_ecalloc_v1(size_t nmemb, size_t size) __malloc_like; -__dso_public void *sudo_emalloc_v1(size_t size) __malloc_like; -__dso_public void *sudo_emallocarray_v1(size_t nmemb, size_t size) __malloc_like; -__dso_public void *sudo_erealloc_v1(void *ptr, size_t size); -__dso_public void *sudo_ereallocarray_v1(void *ptr, size_t nmemb, size_t size); -__dso_public void *sudo_erecalloc_v1(void *ptr, size_t onmemb, size_t nmemb, size_t msize); -__dso_public char *sudo_estrdup_v1(const char *src) __malloc_like; -__dso_public char *sudo_estrndup_v1(const char *src, size_t maxlen) __malloc_like; - -#define sudo_easprintf sudo_easprintf_v1 -#define sudo_evasprintf(_a, _b, _c) sudo_evasprintf_v1((_a), (_b), (_c)) -#define sudo_ecalloc(_a, _b) sudo_ecalloc_v1((_a), (_b)) -#define sudo_emalloc(_a) sudo_emalloc_v1((_a)) -#define sudo_emallocarray(_a, _b) sudo_emallocarray_v1((_a), (_b)) -#define sudo_erealloc(_a, _b) sudo_erealloc_v1((_a), (_b)) -#define sudo_ereallocarray(_a, _b, _c) sudo_ereallocarray_v1((_a), (_b), (_c)) -#define sudo_erecalloc(_a, _b, _c, _d) sudo_erecalloc_v1((_a), (_b), (_c), (_d)) -#define sudo_estrdup(_a) sudo_estrdup_v1((_a)) -#define sudo_estrndup(_a, _b) sudo_estrndup_v1((_a), (_b)) - -#endif /* SUDO_ALLOC_H */ diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index c84556df9..6d1059e2a 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -100,7 +100,7 @@ DEVEL = @DEVEL@ SHELL = @SHELL@ -LTOBJS = alloc.lo event.lo fatal.lo key_val.lo gethostname.lo gettime.lo \ +LTOBJS = event.lo fatal.lo key_val.lo gethostname.lo gettime.lo \ gidlist.lo lbuf.lo locking.lo parseln.lo progname.lo secure_path.lo \ setgroups.lo strsplit.lo strtobool.lo strtoid.lo strtomode.lo \ sudo_conf.lo sudo_debug.lo sudo_dso.lo term.lo ttysize.lo \ @@ -332,10 +332,6 @@ aix.lo: $(srcdir)/aix.c $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \ $(incdir)/sudo_debug.h $(incdir)/sudo_fatal.h $(incdir)/sudo_gettext.h \ $(incdir)/sudo_queue.h $(incdir)/sudo_util.h $(top_builddir)/config.h $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/aix.c -alloc.lo: $(srcdir)/alloc.c $(incdir)/compat/stdbool.h $(incdir)/sudo_alloc.h \ - $(incdir)/sudo_compat.h $(incdir)/sudo_fatal.h \ - $(incdir)/sudo_gettext.h $(top_builddir)/config.h - $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/alloc.c atofoo_test.lo: $(srcdir)/regress/atofoo/atofoo_test.c \ $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \ $(incdir)/sudo_fatal.h $(incdir)/sudo_util.h \ diff --git a/lib/util/alloc.c b/lib/util/alloc.c deleted file mode 100644 index 325d2072e..000000000 --- a/lib/util/alloc.c +++ /dev/null @@ -1,259 +0,0 @@ -/* - * Copyright (c) 1999-2005, 2007, 2010-2014 - * Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Sponsored in part by the Defense Advanced Research Projects - * Agency (DARPA) and Air Force Research Laboratory, Air Force - * Materiel Command, USAF, under agreement number F39502-99-1-0512. - */ - -#include - -#include -#include -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif /* STDC_HEADERS */ -#ifdef HAVE_STRING_H -# if defined(HAVE_MEMORY_H) && !defined(STDC_HEADERS) -# include -# endif -# include -#endif /* HAVE_STRING_H */ -#ifdef HAVE_STRINGS_H -# include -#endif /* HAVE_STRING_H */ -#if defined(HAVE_MALLOC_H) && !defined(STDC_HEADERS) -# include -#endif /* HAVE_MALLOC_H && !STDC_HEADERS */ -#if defined(HAVE_STDINT_H) -# include -#elif defined(HAVE_INTTYPES_H) -# include -#endif -#include - -#define DEFAULT_TEXT_DOMAIN "sudo" -#include "sudo_gettext.h" /* must be included before sudo_compat.h */ - -#include "sudo_compat.h" -#include "sudo_alloc.h" -#include "sudo_fatal.h" - -/* - * sudo_emalloc() calls the system malloc(3) and exits with an error if - * malloc(3) fails. - */ -void * -sudo_emalloc_v1(size_t size) -{ - void *ptr; - - if (size == 0) - sudo_fatalx_nodebug(_("internal error, tried allocate zero bytes")); - - if ((ptr = malloc(size)) == NULL) - sudo_fatal_nodebug(NULL); - return ptr; -} - -/* - * sudo_emallocarray() allocates nmemb * size bytes and exits with an error - * if overflow would occur or if the system malloc(3) fails. - */ -void * -sudo_emallocarray_v1(size_t nmemb, size_t size) -{ - void *ptr; - - if (nmemb == 0 || size == 0) - sudo_fatalx_nodebug(_("internal error, tried allocate zero bytes")); - if (nmemb > SIZE_MAX / size) - sudo_fatalx_nodebug(_("internal error, %s overflow"), "sudo_emallocarray"); - - size *= nmemb; - if ((ptr = malloc(size)) == NULL) - sudo_fatal_nodebug(NULL); - return ptr; -} - -/* - * sudo_ecalloc() allocates nmemb * size bytes and exits with an error - * if overflow would occur or if the system malloc(3) fails. - * On success, the allocated space is zero-filled. - */ -void * -sudo_ecalloc_v1(size_t nmemb, size_t size) -{ - void *ptr; - - if (nmemb == 0 || size == 0) - sudo_fatalx_nodebug(_("internal error, tried allocate zero bytes")); - if (nmemb != 1) { - if (nmemb > SIZE_MAX / size) - sudo_fatalx_nodebug(_("internal error, %s overflow"), "sudo_ecalloc"); - size *= nmemb; - } - if ((ptr = malloc(size)) == NULL) - sudo_fatal_nodebug(NULL); - memset(ptr, 0, size); - return ptr; -} - -/* - * sudo_erealloc() calls the system realloc(3) and exits with an error if - * realloc(3) fails. You can call sudo_erealloc() with a NULL pointer even - * if the system realloc(3) does not support this. - */ -void * -sudo_erealloc_v1(void *ptr, size_t size) -{ - - if (size == 0) - sudo_fatalx_nodebug(_("internal error, tried allocate zero bytes")); - - ptr = ptr ? realloc(ptr, size) : malloc(size); - if (ptr == NULL) - sudo_fatal_nodebug(NULL); - return ptr; -} - -/* - * sudo_ereallocarray() sudo_realloc(3)s nmemb * size bytes and exits with an - * error if overflow would occur or if the system malloc(3)/realloc(3) fails. - * You can call sudo_ereallocarray() with a NULL pointer even if the system - * realloc(3) does not support this. - */ -void * -sudo_ereallocarray_v1(void *ptr, size_t nmemb, size_t size) -{ - - if (nmemb == 0 || size == 0) - sudo_fatalx_nodebug(_("internal error, tried allocate zero bytes")); - if (nmemb > SIZE_MAX / size) - sudo_fatalx_nodebug(_("internal error, %s overflow"), "sudo_ereallocarray"); - - size *= nmemb; - ptr = ptr ? realloc(ptr, size) : malloc(size); - if (ptr == NULL) - sudo_fatal_nodebug(NULL); - return ptr; -} - -/* - * sudo_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. - * On success, the new space is zero-filled. You can call sudo_erealloc() - * with a NULL pointer even if the system realloc(3) does not support this. - */ -void * -sudo_erecalloc_v1(void *ptr, size_t onmemb, size_t nmemb, size_t msize) -{ - size_t size; - - if (nmemb == 0 || msize == 0) - sudo_fatalx_nodebug(_("internal error, tried allocate zero bytes")); - if (nmemb > SIZE_MAX / msize) - sudo_fatalx_nodebug(_("internal error, %s overflow"), "sudo_erecalloc"); - - size = nmemb * msize; - ptr = ptr ? realloc(ptr, size) : malloc(size); - if (ptr == NULL) - sudo_fatal_nodebug(NULL); - if (nmemb > onmemb) { - size = (nmemb - onmemb) * msize; - memset((char *)ptr + (onmemb * msize), 0, size); - } - return ptr; -} - -/* - * sudo_estrdup() is like strdup(3) except that it exits with an error if - * malloc(3) fails. NOTE: unlike strdup(3), sudo_estrdup(NULL) is legal. - */ -char * -sudo_estrdup_v1(const char *src) -{ - char *dst = NULL; - size_t len; - - if (src != NULL) { - len = strlen(src); - dst = sudo_emalloc(len + 1); - (void) memcpy(dst, src, len); - dst[len] = '\0'; - } - return dst; -} - -/* - * sudo_estrndup() is like strndup(3) except that it exits with an error if - * malloc(3) fails. NOTE: unlike strdup(3), sudo_estrdup(NULL) is legal. - */ -char * -sudo_estrndup_v1(const char *src, size_t maxlen) -{ - char *dst = NULL; - size_t len = 0; - - if (src != NULL) { - while (maxlen != 0 && src[len] != '\0') { - len++; - maxlen--; - } - dst = sudo_emalloc(len + 1); - (void) memcpy(dst, src, len); - dst[len] = '\0'; - } - return dst; -} - -/* - * sudo_easprintf() calls vasprintf() and exits with an error if vasprintf() - * returns -1 (out of memory). - */ -int -sudo_easprintf_v1(char **ret, const char *fmt, ...) -{ - int len; - va_list ap; - - va_start(ap, fmt); - len = vasprintf(ret, fmt, ap); - va_end(ap); - - if (len == -1) - sudo_fatal_nodebug(NULL); - return len; -} - -/* - * sudo_evasprintf() calls vasprintf() and exits with an error if vasprintf() - * returns -1 (out of memory). - */ -int -sudo_evasprintf_v1(char **ret, const char *fmt, va_list args) -{ - int len; - - if ((len = vasprintf(ret, fmt, args)) == -1) - sudo_fatal_nodebug(NULL); - return len; -}