From 9e17f41cafa0e76ab69f0a1cd979b34f34e5a737 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 18 Nov 2015 18:46:21 -0800 Subject: [PATCH] libobs/util: Don't perform memalign trick of pointer null --- libobs/util/bmem.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libobs/util/bmem.c b/libobs/util/bmem.c index cb439b84a..25809667e 100644 --- a/libobs/util/bmem.c +++ b/libobs/util/bmem.c @@ -44,9 +44,11 @@ static void *a_malloc(size_t size) long diff; ptr = malloc(size + ALIGNMENT); - diff = ((~(long)ptr) & (ALIGNMENT - 1)) + 1; - ptr = (char *)ptr + diff; - ((char *)ptr)[-1] = (char)diff; + if (ptr) { + diff = ((~(long)ptr) & (ALIGNMENT - 1)) + 1; + ptr = (char *)ptr + diff; + ((char *)ptr)[-1] = (char)diff; + } return ptr; #else