Mercurial > hg > dmlib

changeset 1134:d0898867ec4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Various fixes for issues reported by clang static analyzer.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 04 Mar 2015 08:38:19 +0200
parents 2af228303727
children 73808dce89e6
files minijss/jss.h minijss/jssplr.c src/dmzlib.c src/libgfx.c src/stb_image.c tests/testdmzlib.c tools/lib64gfx.c tools/xm2jss.c
diffstat 8 files changed, 10 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/minijss/jss.h	Wed Mar 04 07:16:06 2015 +0200
+++ b/minijss/jss.h	Wed Mar 04 08:38:19 2015 +0200
@@ -84,7 +84,7 @@
  * and debug-messages. Otherwise use a macro stub.
  */
 #ifndef JSS_LIGHT
-#  define JSSERROR(MEVAL, MRET, ...) do { jssError(MEVAL, __FILE__, (int) __LINE__, __VA_ARGS__); if (jssErrorIsFatal) return MRET; } while (0)
+#  define JSSERROR(MEVAL, MRET, ...) do { jssError(MEVAL, __FILE__, (int) __LINE__, __VA_ARGS__); return MRET; } while (0)
 #  define JSSWARNING(MEVAL, MRET, ...) do { jssWarning(MEVAL, __FILE__, (int) __LINE__, __VA_ARGS__); if (jssWarningIsFatal) return MRET; } while (0)
 #  ifdef JSS_DEBUG
 #    define JSSDEBUG(...) do { fprintf(stderr, "[%s:%d]: ", __FILE__, (int) __LINE__); fprintf(stderr, __VA_ARGS__); } while (0)
@@ -92,7 +92,7 @@
 #    define JSSDEBUG(...) do { } while (0)
 #  endif // NDEBUG
 #else
-#  define JSSERROR(MEVAL, MRET, ...) do { return MRET; } while (0)
+#  define JSSERROR(MRET, MRET, ...) return MRET
 #  define JSSWARNING(MEVAL, MRET, ...) do { } while (0)
 #  define JSSDEBUG(...) do { } while (0)
 #endif // JSS_LIGHT
--- a/minijss/jssplr.c	Wed Mar 04 07:16:06 2015 +0200
+++ b/minijss/jssplr.c	Wed Mar 04 08:38:19 2015 +0200
@@ -379,9 +379,6 @@
 static void jmpSetNewOrder(JSSPlayer * mp, int order)
 {
     BOOL orderOK;
-    int pattern;
-
-    pattern = jsetOrderEnd;
     mp->order = jsetNotSet;
     orderOK = FALSE;
 
@@ -394,7 +391,7 @@
         }
         else
         {
-            pattern = mp->module->orderList[order];
+            int pattern = mp->module->orderList[order];
             if (pattern == jsetOrderSkip)
             {
                 order++;
@@ -640,6 +637,7 @@
                 delta = 255;
                 break;
             case 3:
+            default:
                 delta = jmpSineTab[tmp];
                 break;
         }
@@ -677,6 +675,7 @@
                 delta = 255;
                 break;
             case 3:
+            default:
                 delta = jmpSineTab[tmp];
                 break;
         }
--- a/src/dmzlib.c	Wed Mar 04 07:16:06 2015 +0200
+++ b/src/dmzlib.c	Wed Mar 04 08:38:19 2015 +0200
@@ -406,6 +406,7 @@
     }
 
     // Get lengths table (uninitialized entries should be set to 0)
+    codeLengths[256] = 0;
     memset(codeLengthSizes, 0, sizeof(codeLengthSizes));
     for (i = 0; i < hclen; i++)
     {
--- a/src/libgfx.c	Wed Mar 04 07:16:06 2015 +0200
+++ b/src/libgfx.c	Wed Mar 04 08:38:19 2015 +0200
@@ -469,7 +469,7 @@
     png_write_end(png_ptr, NULL);
 
 error:
-    if (info_ptr->palette)
+    if (info_ptr && info_ptr->palette)
         png_free(png_ptr, info_ptr->palette);
 
     if (png_ptr && info_ptr)
--- a/src/stb_image.c	Wed Mar 04 07:16:06 2015 +0200
+++ b/src/stb_image.c	Wed Mar 04 08:38:19 2015 +0200
@@ -4077,7 +4077,6 @@
             stbi__get32le(s);
          }
          if (bpp == 16 || bpp == 32) {
-            mr = mg = mb = 0;
             if (compress == 0) {
                if (bpp == 32) {
                   mr = 0xffu << 16;
--- a/tests/testdmzlib.c	Wed Mar 04 07:16:06 2015 +0200
+++ b/tests/testdmzlib.c	Wed Mar 04 08:38:19 2015 +0200
@@ -179,6 +179,8 @@
     dmMsg(0, "Operating mode: %s\n",
         compress ? "compress" : "decompress");
 
+    memset(&zstr, 0, sizeof(zstr));
+
     if ((inBuffer = malloc(SET_TMPBUF_SIZE)) == NULL ||
         (outBuffer = malloc(SET_TMPBUF_SIZE)) == NULL)
     {
@@ -186,7 +188,6 @@
         goto out;
     }
 
-    memset(&zstr, 0, sizeof(zstr));
     if (compress)
         zret = deflateInit(&zstr, level);
     else
--- a/tools/lib64gfx.c	Wed Mar 04 07:16:06 2015 +0200
+++ b/tools/lib64gfx.c	Wed Mar 04 08:38:19 2015 +0200
@@ -645,6 +645,7 @@
                 score = DM_PROBE_SCORE_GOOD;
         }
         else
+        if (fmt->probe != NULL)
             score = fmt->probe(buf, len, fmt);
 
         if (score > scoreMax)
--- a/tools/xm2jss.c	Wed Mar 04 07:16:06 2015 +0200
+++ b/tools/xm2jss.c	Wed Mar 04 08:38:19 2015 +0200
@@ -498,11 +498,9 @@
                 i = jssConvertPatternRawElem(patBuf, patBufSize, &finalSize, m->patterns[pattern]);
                 break;
             default:
-                i = DMERR_INVALID_DATA;
                 dmFree(patBuf);
                 JSSERROR(DMERR_INVALID_DATA, DMERR_INVALID_DATA,
                 "Unsupported pattern conversion mode %d.\n", patMode);
-                break;
         }
 
         if (i != DMERR_OK)