Merge branch 'obsd-master'

1 files changed, 15 insertions, 2 deletions

diff --git a/xmalloc.c b/xmalloc.c
index df583e55..a1bc6b8f 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -67,7 +67,20 @@ xmalloc(size_t size)
 }
 
 void *
-xrealloc(void *oldptr, size_t nmemb, size_t size)
+xrealloc(void *oldptr, size_t newsize)
+{
+	void	*newptr;
+
+	if (newsize == 0)
+		fatalx("zero size");
+	if ((newptr = realloc(oldptr, newsize)) == NULL)
+		fatal("xrealloc failed");
+
+	return (newptr);
+}
+
+void *
+xreallocarray(void *oldptr, size_t nmemb, size_t size)
 {
 	size_t	 newsize = nmemb * size;
 	void	*newptr;
@@ -77,7 +90,7 @@ xrealloc(void *oldptr, size_t nmemb, size_t size)
 	if (SIZE_MAX / nmemb < size)
 		fatalx("nmemb * size > SIZE_MAX");
 	if ((newptr = realloc(oldptr, newsize)) == NULL)
-		fatal("xrealloc failed");
+		fatal("xreallocarray failed");
 
 	return (newptr);
 }