diff options
Diffstat (limited to 'src/lib/libc/stdlib/malloc.c')
| -rw-r--r-- | src/lib/libc/stdlib/malloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index a3babab20a..e1e1831a94 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: malloc.c,v 1.79 2005/10/10 12:00:52 espie Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.80 2006/02/14 11:14:11 espie Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * ---------------------------------------------------------------------------- | 4 | * ---------------------------------------------------------------------------- |
| @@ -1685,10 +1685,6 @@ ifree(void *ptr) | |||
| 1685 | u_long pidx, index; | 1685 | u_long pidx, index; |
| 1686 | struct pdinfo *pi; | 1686 | struct pdinfo *pi; |
| 1687 | 1687 | ||
| 1688 | /* This is legal */ | ||
| 1689 | if (ptr == NULL) | ||
| 1690 | return; | ||
| 1691 | |||
| 1692 | if (!malloc_started) { | 1688 | if (!malloc_started) { |
| 1693 | wrtwarning("malloc() has never been called"); | 1689 | wrtwarning("malloc() has never been called"); |
| 1694 | return; | 1690 | return; |
| @@ -1782,6 +1778,10 @@ malloc(size_t size) | |||
| 1782 | void | 1778 | void |
| 1783 | free(void *ptr) | 1779 | free(void *ptr) |
| 1784 | { | 1780 | { |
| 1781 | /* This is legal. XXX quick path */ | ||
| 1782 | if (ptr == NULL) | ||
| 1783 | return; | ||
| 1784 | |||
| 1785 | _MALLOC_LOCK(); | 1785 | _MALLOC_LOCK(); |
| 1786 | malloc_func = " in free():"; | 1786 | malloc_func = " in free():"; |
| 1787 | if (malloc_active++) { | 1787 | if (malloc_active++) { |
