libio: Disable vtable validation for pre-2.1 interposed handles [BZ #25203]

[thirdparty/glibc.git] / malloc / morecore.c

diff --git a/malloc/morecore.c b/malloc/morecore.c
index 0a644c36ad101eae7081f729fc07ab7e8d886401..edfceda92639e204cfbdd5893c488506e797c34f 100644 (file)
--- a/malloc/morecore.c
+++ b/malloc/morecore.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -15,27 +15,27 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef        _MALLOC_INTERNAL
-#define        _MALLOC_INTERNAL
-#include <malloc.h>
+#ifndef _MALLOC_INTERNAL
+# define _MALLOC_INTERNAL
+# include <malloc.h>
 #endif
 
-#ifndef        __GNU_LIBRARY__
-#define        __sbrk  sbrk
+#ifndef __GNU_LIBRARY__
+# define __sbrk  sbrk
 #endif
 
 #ifdef __GNU_LIBRARY__
 /* It is best not to declare this and cast its result on foreign operating
    systems with potentially hostile include files.  */
 
-#include <stddef.h>
-#include <stdlib.h>
+# include <stddef.h>
+# include <stdlib.h>
 extern void *__sbrk (ptrdiff_t increment) __THROW;
 libc_hidden_proto (__sbrk)
 #endif
 
 #ifndef NULL
-#define NULL 0
+# define NULL 0
 #endif
 
 /* Allocate INCREMENT more bytes of data space,
@@ -47,6 +47,7 @@ __default_morecore (ptrdiff_t increment)
   void *result = (void *) __sbrk (increment);
   if (result == (void *) -1)
     return NULL;
+
   return result;
 }
 libc_hidden_def (__default_morecore)