From 0489842997ddf0b4fb96d81b82ee6dd58bd9f866 Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain.goyet@numworks.com>
Date: Wed, 10 Oct 2018 15:40:48 +0200
Subject: [PATCH] [kandinsky] Make sure the image compressor can actually
 compress

---
 escher/image/inliner.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/escher/image/inliner.c b/escher/image/inliner.c
index 372ded8ea..4f3a4290b 100644
--- a/escher/image/inliner.c
+++ b/escher/image/inliner.c
@@ -13,6 +13,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <ctype.h>
+#include <assert.h>
 #include "../../ion/src/external/lz4/lz4hc.h"
 
 #define ERROR_IF(cond, message) if (cond) { printf(message); return -1; };
@@ -148,7 +149,7 @@ void generateHeaderFromImage(FILE * file, const char * guardian, const char * va
 
 void generateImplementationFromImage(FILE * file, const char * header, const char * variable, uint32_t width, uint32_t height, png_bytep * pixelsRowPointers) {
 
-  int sizeOfPixelBuffer = width*height*sizeof(uint16_t);
+  int sizeOfPixelBuffer = width * height * sizeof(uint16_t);
   uint16_t * pixelBuffer = (uint16_t *)malloc(sizeOfPixelBuffer);
 
   for (int j=0; j<height; j++) {
@@ -171,15 +172,18 @@ void generateImplementationFromImage(FILE * file, const char * header, const cha
     }
   }
 
-  uint8_t * compressedPixelBuffer = malloc(sizeOfPixelBuffer);
+  int maxSizeOfCompressedPixelBuffer = LZ4_compressBound(sizeOfPixelBuffer);
+  uint8_t * compressedPixelBuffer = malloc(maxSizeOfCompressedPixelBuffer);
   int sizeOfCompressedPixelBuffer = LZ4_compress_HC(
     pixelBuffer,
     compressedPixelBuffer,
     sizeOfPixelBuffer,
-    sizeOfCompressedPixelBuffer,
+    maxSizeOfCompressedPixelBuffer,
     LZ4HC_CLEVEL_MAX
   );
 
+  assert(sizeOfCompressedPixelBuffer != 0);
+
   fprintf(file, "// This file is auto-generated by Inliner. Do not edit manually.\n");
   fprintf(file, "#include \"%s.h\"\n\n", header);