libobs/util: Don't perform memalign trick of pointer null

2015-11-18 18:46:21 -08:00
parent d510b629c9
commit 9e17f41caf
1 changed files with 5 additions and 3 deletions
--- 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