added memory allocation checks (fixes issue 355)

[openjpeg.git] / src / lib / openjp2 / cio.c

diff --git a/src/lib/openjp2/cio.c b/src/lib/openjp2/cio.c
index 062627f054f9b9edc84215b825048ad1fc190048..c455bf7711043ab5c27000cb99d9b3fcd7032272 100644 (file)
--- a/src/lib/openjp2/cio.c
+++ b/src/lib/openjp2/cio.c
@@ -1,11 +1,17 @@
 /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France 
+ * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR 
  * Copyright (c) 2012, CS Systemes d'Information, France
  * All rights reserved.
  *
@@ -145,12 +151,11 @@ void opj_read_float_LE(const OPJ_BYTE * p_buffer, OPJ_FLOAT32 * p_value)
 opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_SIZE_T p_buffer_size,OPJ_BOOL l_is_input)
 {
        opj_stream_private_t * l_stream = 00;
-       l_stream = (opj_stream_private_t*) opj_malloc(sizeof(opj_stream_private_t));
+       l_stream = (opj_stream_private_t*) opj_calloc(1,sizeof(opj_stream_private_t));
        if (! l_stream) {
                return 00;
        }
 
-       memset(l_stream,0,sizeof(opj_stream_private_t));
        l_stream->m_buffer_size = p_buffer_size;
        l_stream->m_stored_data = (OPJ_BYTE *) opj_malloc(p_buffer_size);
        if (! l_stream->m_stored_data) {
@@ -189,27 +194,15 @@ void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream)
        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
        
        if (l_stream) {
+               if (l_stream->m_free_user_data_fn) {
+                       l_stream->m_free_user_data_fn(l_stream->m_user_data);
+               }
                opj_free(l_stream->m_stored_data);
                l_stream->m_stored_data = 00;
                opj_free(l_stream);
        }
 }
 
-void OPJ_CALLCONV opj_stream_destroy_v3(opj_stream_t* p_stream)
-{
-    opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
-    
-    if (l_stream) {
-        FILE *fp = (FILE*)l_stream->m_user_data;
-        if(fp) 
-            fclose(fp);
-        
-        opj_free(l_stream->m_stored_data);
-        l_stream->m_stored_data = 00;
-        opj_free(l_stream);
-    }
-}
-
 void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_stream_read_fn p_function)
 {
        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
@@ -253,12 +246,13 @@ void OPJ_CALLCONV opj_stream_set_skip_function(opj_stream_t* p_stream, opj_strea
        l_stream->m_skip_fn = p_function;
 }
 
-void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data)
+void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data, opj_stream_free_user_data_fn p_function)
 {
        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
        if (!l_stream)
                return;
        l_stream->m_user_data = p_data;
+  l_stream->m_free_user_data_fn = p_function;
 }
 
 void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream, OPJ_UINT64 data_length)
@@ -522,7 +516,6 @@ OPJ_OFF_T opj_stream_write_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_si
        if (! l_is_written) {
                p_stream->m_status |= opj_stream_e_error;
                p_stream->m_bytes_in_buffer = 0;
-               p_stream->m_current_data = p_stream->m_current_data;
                return (OPJ_OFF_T) -1;
        }
        /* then skip */