Mercurial > hg > dmlib

changeset 1744:e40227e994e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix unitialized data accesses.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 10 Jun 2018 17:56:08 +0300
parents bcdea45a14cb
children 2dbb2b63f6b3
files src/dmgrowbuf.c tools/lib64gfx.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/dmgrowbuf.c	Sun Jun 10 02:54:51 2018 +0300
+++ b/src/dmgrowbuf.c	Sun Jun 10 17:56:08 2018 +0300
@@ -372,7 +372,7 @@
     }
     else
     {
-        if (buf->offs <= buf->len)
+        if (buf->offs < buf->len)
             *value = buf->data[buf->offs++];
         else
             return FALSE;
--- a/tools/lib64gfx.c	Sun Jun 10 02:54:51 2018 +0300
+++ b/tools/lib64gfx.c	Sun Jun 10 17:56:08 2018 +0300
@@ -444,7 +444,7 @@
         if (cfg->type == DM_COMP_RLE_MARKER)
         {
             // A simple marker byte RLE variant: [Marker] [count] [data]
-            if (data == cfg->rleMarkerB && (cfg->flags & DM_RLE_BYTE_RUNS))
+            if ((cfg->flags & DM_RLE_BYTE_RUNS) && data == cfg->rleMarkerB)
             {
                 if (!dmGrowBufGetU8(&src, &tmp1) ||
                     !dmGrowBufGetU8(&src, &tmp2))
@@ -468,7 +468,7 @@
                 }
             }
             else
-            if (data == cfg->rleMarkerW && (cfg->flags & DM_RLE_WORD_RUNS))
+            if ((cfg->flags & DM_RLE_WORD_RUNS) && data == cfg->rleMarkerW)
             {
                 if (!dmGrowBufGetU8(&src, &tmp1) ||
                     !dmGrowBufGetU8(&src, &tmp2) ||