Merge branch 'heapmode_alloc_failure_fix' into dev

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/lz4.c b/lib/lz4.c
index 39bf5d6..cd0776b 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -731,6 +731,10 @@ int LZ4_compress_fast(const char* source, char* dest, int inputSize, int maxOutp
     void* ctxPtr = &ctx;
 #endif
 
+#if (HEAPMODE)
+    if (!ctxPtr) { return 0; }
+#endif
+
     int result = LZ4_compress_fast_extState(ctxPtr, source, dest, inputSize, maxOutputSize, acceleration);
 
 #if (HEAPMODE)
@@ -963,6 +967,10 @@ int LZ4_compress_destSize(const char* src, char* dst, int* srcSizePtr, int targe
     void* ctx = &ctxBody;
 #endif
 
+#if (HEAPMODE)
+    if (!ctx) { return 0; }
+#endif
+
     int result = LZ4_compress_destSize_extState(ctx, src, dst, srcSizePtr, targetDstSize);
 
 #if (HEAPMODE)
@@ -980,6 +988,7 @@ int LZ4_compress_destSize(const char* src, char* dst, int* srcSizePtr, int targe
 LZ4_stream_t* LZ4_createStream(void)
 {
     LZ4_stream_t* lz4s = (LZ4_stream_t*)ALLOCATOR(8, LZ4_STREAMSIZE_U64);
+    if (!lz4s) { return NULL; }
     LZ4_STATIC_ASSERT(LZ4_STREAMSIZE >= sizeof(LZ4_stream_t_internal));    /* A compilation error here means LZ4_STREAMSIZE is not large enough */
     LZ4_resetStream(lz4s);
     return lz4s;
@@ -1541,6 +1550,7 @@ int LZ4_resetStreamState(void* state, char* inputBuffer)
 void* LZ4_create (char* inputBuffer)
 {
     void* lz4ds = ALLOCATOR(8, LZ4_STREAMSIZE_U64);
+    if (!lz4ds) { return NULL; }
     LZ4_init ((LZ4_stream_t_internal*)lz4ds, (BYTE*)inputBuffer);
     return lz4ds;
 }