diff options
| -rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 3 | ||||
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 9 | ||||
| -rw-r--r-- | nx-X11/config/cf/linux.cf | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/include/os.h | 6 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/Imakefile | 9 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/reallocarray.c | 43 |
6 files changed, 70 insertions, 3 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 879b55a3b..8d2526712 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -417,6 +417,9 @@ XCOMM the platform-specific parameters - edit site.def to change #ifndef HasStrlcat #define HasStrlcat NO /* assume not */ #endif +#ifndef HasReallocarray +#define HasReallocarray NO /* assume not */ +#endif #ifndef HasDlopen #define HasDlopen NO /* assume not */ #endif diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index d5527cdc7..ddd6e0bad 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -707,8 +707,15 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #define ServerSnprintfDefines /**/ #endif #endif +#ifndef ServerReallocarrayDefines +#if HasReallocarray +#define ServerReallocarrayDefines -DHAVE_REALLOCARRAY +#else +#define ServerReallocarrayDefines /**/ +#endif +#endif #ifndef ServerDefines -#define ServerDefines StandardDefines PervasiveExtensionDefines ServerExtraDefines ServerAssertDefines ServerSnprintfDefines +#define ServerDefines StandardDefines PervasiveExtensionDefines ServerExtraDefines ServerAssertDefines ServerSnprintfDefines ServerReallocarrayDefines #endif #ifndef MesaUseX86Asm diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index 1a3f6bc5b..2f5aa11f6 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -402,6 +402,9 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #ifndef HasSnprintf #define HasSnprintf YES #endif +#ifndef HasReallocarray +#define HasReallocarray NO +#endif #define HasMkstemp YES #endif /* getresuid() appeared in 2.1.4, and getresgid in 2.1.44 */ diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h index a53f0d4c8..a8ef1896d 100644 --- a/nx-X11/programs/Xserver/include/os.h +++ b/nx-X11/programs/Xserver/include/os.h @@ -448,6 +448,12 @@ extern void AbortDDX(void); extern void ddxGiveUp(void); extern int TimeSinceLastInputEvent(void); +#ifndef HAVE_REALLOCARRAY +#define reallocarray xreallocarray +extern _X_EXPORT void * +reallocarray(void *optr, size_t nmemb, size_t size); +#endif + #ifndef HAVE_STRLCPY extern _X_EXPORT size_t strlcpy(char *dst, const char *src, size_t siz); diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index 26d9c6dff..2abc1aff9 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -102,6 +102,11 @@ STRLCAT_SRCS = strlcat.c strlcpy.c STRLCAT_OBJS = strlcat.o strlcpy.o #endif +#if !HasReallocarray +REALLOCARRAY_SRCS = reallocarray.c +REALLOCARRAY_OBJS = reallocarray.o +#endif + #if HasGetpeerucred GETPEER_DEFINES = -DHAS_GETPEERUCRED #else @@ -115,12 +120,12 @@ BOOTSTRAPCFLAGS = osinit.c utils.c log.c auth.c mitauth.c secauth.c \ $(XDMAUTHSRCS) $(RPCSRCS) xdmcp.c OtherSources \ xstrans.c $(SNPRINTF_SRCS) $(STRLCAT_SRCS) \ - xprintf.c + $(REALLOCARRAY_SRCS) xprintf.c OBJS = WaitFor.o access.o connection.o io.o $(COLOR_OBJS) \ osinit.o utils.o log.o auth.o mitauth.o secauth.o \ $(XDMAUTHOBJS) $(RPCOBJS) xdmcp.o OtherObjects \ xstrans.o $(SNPRINTF_OBJS) $(STRLCAT_OBJS) \ - xprintf.o + $(REALLOCARRAY_OBJS) xprintf.o #if UseMemLeak MEM_DEFINES = -DMEMBUG diff --git a/nx-X11/programs/Xserver/os/reallocarray.c b/nx-X11/programs/Xserver/os/reallocarray.c new file mode 100644 index 000000000..c415e09af --- /dev/null +++ b/nx-X11/programs/Xserver/os/reallocarray.c @@ -0,0 +1,43 @@ +/* $OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook Exp $ */ +/* + * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> + * + * 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. + */ + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + +#include <sys/types.h> +#include <errno.h> +#include <stdint.h> +#include <stdlib.h> +#include "os.h" + +/* + * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX + * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW + */ +#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) + +void * +reallocarray(void *optr, size_t nmemb, size_t size) +{ + if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && + nmemb > 0 && SIZE_MAX / nmemb < size) { + errno = ENOMEM; + return NULL; + } + return realloc(optr, size * nmemb); +} |