Removed null-pointer dereference in low mem.

[umurmur.git] / src / memory.c

diff --git a/src/memory.c b/src/memory.c
new file mode 100644 (file)
index 0000000..1a0ed18
--- /dev/null
+++ b/src/memory.c
@@ -0,0 +1,61 @@
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   - Neither the name of the Developers nor the names of its contributors may
+     be used to endorse or promote products derived from this software without
+     specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#include <stdint.h>
+#include <unistd.h>
+
+#include "log.h"
+#include "memory.h"
+
+void * Memory_safeMalloc(size_t nmem, size_t size) {
+       // Check if we're going to overflow.
+       if (size && num > SIZE_MAX / size)
+               Log_fatal("Request for memory would've overflowed.");
+
+       // Allocate the memory requested.
+       void * retPtr = malloc(nmem * size);
+
+       // Check if we had an error.
+       if (retPtr == NULL)
+               Log_fatal("Out of memory.");
+
+       return retPtr;
+}
+
+void * Memory_safeCalloc(size_t nmem, size_t size) {
+       // Allocate the memory requested.
+       void * retPtr = calloc(nmem, size);
+
+       // Check if we had an error.
+       if (retPtr == NULL)
+               Log_fatal("Out of memory.");
+
+       return retPtr;
+}