[trunk] JP3D: Handles errors properly

diff --git a/src/lib/openjp3d/cio.c b/src/lib/openjp3d/cio.c
index 10bd2af329bbe9faf64f512f4cab4b68b95bf592..7b2c5e4e176edce2bfe879eeb507596029132cef 100644 (file)
--- a/src/lib/openjp3d/cio.c
+++ b/src/lib/openjp3d/cio.c
@@ -58,6 +58,7 @@ opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer
                cio->length = cp->tdx * cp->tdy * cp->tdz * cp->tw * cp->th * cp->tl * 4;
                cio->buffer = (unsigned char *)opj_malloc(cio->length);
                if(!cio->buffer) {
+                       opj_event_msg(cio->cinfo, EVT_ERROR, "Error allocating memory for compressed bitstream\n");
                        opj_free(cio);
                        return NULL;
                }

diff --git a/src/lib/openjp3d/t2.c b/src/lib/openjp3d/t2.c
index 7fd551e56a334f5df116dd133c0f80174f3efc28..65d98c1337cf9d3655f78a4ff96cb4725071a7cf 100644 (file)
--- a/src/lib/openjp3d/t2.c
+++ b/src/lib/openjp3d/t2.c
@@ -479,6 +479,7 @@ int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_tile_t *
        if (tcp->csty & J3D_CP_CSTY_EPH) {
                if ((*hd) != 0xff || (*(hd + 1) != 0x92)) {
                        opj_event_msg(t2->cinfo, EVT_ERROR, "Expected EPH marker\n");
+                       return -999;
                } else {
                        hd += 2;
                }