Bounds check before fixed-size memcmp() in CJPX_Decoder::Init().

core/src/fxcodec/codec/fx_codec_jpx_opj.cpp

Index: core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
index 4494244410854eb4f86c30fc547747d932191ce4..a1a5b18517b0f9d54a4bdcd81943ac7424eea4f4 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -8,6 +8,9 @@
 #include "codec_int.h"
 #include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h"
 #include "../lcms2/include/fx_lcms2.h"
+namespace {
+const unsigned char szJP2Header[] = { 0x00, 0x00, 0x00, 0x0c, 0x6a, 0x50, 0x20, 0x20, 0x0d, 0x0a, 0x87, 0x0a };
+}  // namespace
 static void fx_error_callback(const char *msg, void *client_data)
 {
     (void)client_data;
@@ -581,7 +584,9 @@ CJPX_Decoder::~CJPX_Decoder()
 }
 FX_BOOL CJPX_Decoder::Init(const unsigned char* src_data, int src_size)
 {
-    opj_dparameters_t parameters;
+    if (!src_data || src_size < sizeof(szJP2Header)) {

[jun_fang, 2014/08/26 22:15:02]

it should be '<=' rather than '<', right?

+        return FALSE;
+    }
     image = NULL;
     m_SrcData = src_data;
     m_SrcSize = src_size;
@@ -593,10 +598,11 @@ FX_BOOL CJPX_Decoder::Init(const unsigned char* src_data, int src_size)
     if (l_stream == NULL) {
         return FALSE;
     }
+    opj_dparameters_t parameters;
     opj_set_default_decoder_parameters(&parameters);
     parameters.decod_format = 0;
     parameters.cod_format = 3;
-    if(FXSYS_memcmp32(m_SrcData, "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a", 12) == 0) {
+    if(FXSYS_memcmp32(m_SrcData, szJP2Header, sizeof(szJP2HeaderSize) == 0) {

[jun_fang, 2014/08/26 22:15:02]

sizeof(szJP2HeaderSize) should be sizeof(szJP2Header)?

         l_codec = opj_create_decompress(OPJ_CODEC_JP2);
         parameters.decod_format = 1;
     } else {