X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Fbase%2Fjas_malloc.c;h=e1f99e239d614371673004693294b40f35e80975;hb=0f683a63c5ba0c53a1077a6a61e8aa4b36c88d2b;hp=6ad4ed2426d0bc7c0cd6dc68df8368cb239d1148;hpb=92caef4ab9527cc610e45d51e6fde0d94a045088;p=gdcm.git

diff --git a/src/gdcmjasper/src/libjasper/base/jas_malloc.c b/src/gdcmjasper/src/libjasper/base/jas_malloc.c
index 6ad4ed24..e1f99e23 100644
--- a/src/gdcmjasper/src/libjasper/base/jas_malloc.c
+++ b/src/gdcmjasper/src/libjasper/base/jas_malloc.c
@@ -64,7 +64,7 @@
 /*
  * Memory Allocator
  *
- * $Id: jas_malloc.c,v 1.1 2005/05/22 18:32:59 malaterre Exp $
+ * $Id: jas_malloc.c,v 1.3 2005/07/05 23:39:06 malaterre Exp $
  */
 
 /******************************************************************************\
@@ -90,7 +90,17 @@
 
 void *jas_malloc(size_t size)
 {
+#ifdef NULL_ON_MALLOC_0
+  // Apparently jasper does not take into account POSIX:
+  // http://www.opengroup.org/onlinepubs/007908799/xsh/malloc.html
+  // If the size of the space requested is 0, the behaviour is implementation-dependent; 
+  // the value returned will be either a null pointer or a unique pointer.
+
+  // As quick fix always over allocate so we avoid the case of the NULL pointer
+  return malloc(size+1);
+#else
   return malloc(size);
+#endif
 }
 
 void jas_free(void *ptr)