Merge branch 'xstrndup+xrealloc' into master

xmalloc.c

@@ -42,12 +42,25 @@ xcalloc(size_t nmemb, size_t size)
     return check_alloc(calloc(nmemb, size));
 }
 
+void *
+xrealloc(void *ptr, size_t size)
+{
+    void *alloc = realloc(ptr, size);
+    return unlikely(size == 0) ? alloc : check_alloc(alloc);
+}
+
 char *
 xstrdup(const char *str)
 {
     return check_alloc(strdup(str));
 }
 
+char *
+xstrndup(const char *str, size_t n)
+{
+    return check_alloc(strndup(str, n));
+}
+
 static VPRINTF(2) int
 xvasprintf_(char **strp, const char *format, va_list ap)
 {

xmalloc.h

@@ -5,5 +5,7 @@
 
 void *xmalloc(size_t size) XMALLOC;
 void *xcalloc(size_t nmemb, size_t size) XMALLOC;
+void *xrealloc(void *ptr, size_t size);
 char *xstrdup(const char *str) XSTRDUP;
+char *xstrndup(const char *str, size_t n) XSTRDUP;
 char *xasprintf(const char *format, ...) PRINTF(1) XMALLOC;