[trunk] import commit 83dad6a76536222a3a51146f942e733a2e90ec52 from ghostpdl

fix potential NULL-pointer dereference caused by testing the wrong variable
after opj_realloc (happens only in OOM situations)

Update issue 225

diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index af25f328a3868f90873319751fed7c0a2d9b5cec..d3f7515b97b3e2a2f58ded8317bcd0b4ea45567e 100644 (file)
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -1719,7 +1719,7 @@ OPJ_BOOL opj_jp2_read_header_procedure(  opj_jp2_t *jp2,
                if (l_current_handler != 00) {
                        if (l_current_data_size > l_last_data_size) {
                                OPJ_BYTE* new_current_data = (OPJ_BYTE*)opj_realloc(l_current_data,l_current_data_size);
-                               if (!l_current_data){
+                               if (!new_current_data) {
                                        opj_free(l_current_data);
                     opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to handle jpeg2000 box\n");
                                        return OPJ_FALSE;