From cd77b6003b774dd337835630ea7b9b1fbc68d264 Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Sat, 30 Apr 2016 12:15:22 +0200
Subject: [PATCH] Fix some coverity warnings

---
 src/lib/openjp2/j2k.c | 11 +++++++----
 src/lib/openjp2/tcd.c |  7 -------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 323a3b80..8086b004 100644
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -9343,16 +9343,19 @@ void j2k_dump (opj_j2k_t* p_j2k, OPJ_INT32 flag, FILE* out_stream)
 
         /* Dump the codestream info from main header */
         if (flag & OPJ_J2K_MH_INFO){
-                opj_j2k_dump_MH_info(p_j2k, out_stream);
+                if (p_j2k->m_private_image)
+                        opj_j2k_dump_MH_info(p_j2k, out_stream);
         }
         /* Dump all tile/codestream info */
         if (flag & OPJ_J2K_TCH_INFO){
           OPJ_UINT32 l_nb_tiles = p_j2k->m_cp.th * p_j2k->m_cp.tw;
           OPJ_UINT32 i;
           opj_tcp_t * l_tcp = p_j2k->m_cp.tcps;
-          for (i=0;i<l_nb_tiles;++i) {
-            opj_j2k_dump_tile_info( l_tcp,(OPJ_INT32)p_j2k->m_private_image->numcomps, out_stream);
-            ++l_tcp;
+          if (p_j2k->m_private_image) {
+            for (i=0;i<l_nb_tiles;++i) {
+              opj_j2k_dump_tile_info( l_tcp,(OPJ_INT32)p_j2k->m_private_image->numcomps, out_stream);
+              ++l_tcp;
+            }
           }
         }
 
diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
index 45d55e59..7ecd97cf 100644
--- a/src/lib/openjp2/tcd.c
+++ b/src/lib/openjp2/tcd.c
@@ -486,7 +486,6 @@ OPJ_BOOL opj_tcd_rateallocate(  opj_tcd_t *tcd,
         for (layno = 0; layno < tcd_tcp->numlayers; layno++) {
                 OPJ_FLOAT64 lo = min;
                 OPJ_FLOAT64 hi = max;
-                OPJ_BOOL success = OPJ_FALSE;
                 OPJ_UINT32 maxlen = tcd_tcp->rates[layno] > 0.0f ? opj_uint_min(((OPJ_UINT32) ceil(tcd_tcp->rates[layno])), len) : len;
                 OPJ_FLOAT64 goodthresh = 0;
                 OPJ_FLOAT64 stable_thresh = 0;
@@ -559,19 +558,13 @@ OPJ_BOOL opj_tcd_rateallocate(  opj_tcd_t *tcd,
                                 }
                         }
 
-                        success = OPJ_TRUE;
                         goodthresh = stable_thresh == 0? thresh : stable_thresh;
 
                         opj_t2_destroy(t2);
                 } else {
-                        success = OPJ_TRUE;
                         goodthresh = min;
                 }
 
-                if (!success) {
-                        return OPJ_FALSE;
-                }
-
                 if(cstr_info) { /* Threshold for Marcela Index */
                         cstr_info->tile[tcd->tcd_tileno].thresh[layno] = goodthresh;
                 }