This was found by coverity

CID: 568
Checker: FORWARD_NULL (help)
File: base/src/extern/libopenjpeg/jp2.c
Function: jp2_decode
Description: Variable "image" tracked as NULL was dereferenced.

fixed by just updating to latest version of the file from
external svn branch.

Kent

diff --git a/extern/libopenjpeg/jp2.c b/extern/libopenjpeg/jp2.c
index 14f9493c4015ed41d331b304ddb7642916bc55e6..b2831cfb0b5940d9b4594bb4d90a53aca528e0dd 100644 (file)
--- a/extern/libopenjpeg/jp2.c
+++ b/extern/libopenjpeg/jp2.c
@@ -561,6 +561,7 @@ opj_image_t* jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, opj_codestream_info_t *c
        image = j2k_decode(jp2->j2k, cio, cstr_info);
        if(!image) {
                opj_event_msg(cinfo, EVT_ERROR, "Failed to decode J2K image\n");
+               return NULL;
        }
 
        /* Set Image Color Space */