From 77968cd25dc790df64b8ecb4d177ca5f4ea7e924 Mon Sep 17 00:00:00 2001
From: Mark Borgerding <mark@borgerding.net>
Date: Fri, 23 Dec 2005 01:33:18 +0000
Subject: [PATCH] finally added the change to kiss_fft.c to check for mem ==
 NULL was not a bug, but enough people thought it was that I went ahead and
 changed it.

---
 Makefile   | 2 +-
 kiss_fft.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8de0032..82f2dd3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-KFVER=1_2_3
+KFVER=1_2_4
 
 DISTDIR=kiss_fft_v$(KFVER)
 TARBALL=kiss_fft_v$(KFVER).tar.gz
diff --git a/kiss_fft.c b/kiss_fft.c
index e4c4044..f6d97ac 100644
--- a/kiss_fft.c
+++ b/kiss_fft.c
@@ -329,7 +329,7 @@ kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem
     if ( lenmem==NULL ) {
         st = ( kiss_fft_cfg)KISS_FFT_MALLOC( memneeded );
     }else{
-        if (*lenmem >= memneeded)
+        if (mem != NULL && *lenmem >= memneeded)
             st = (kiss_fft_cfg)mem;
         *lenmem = memneeded;
     }