# HG changeset patch # User Matti Hamalainen # Date 1528642568 -10800 # Node ID e40227e994e22a6186ea633a00ca5311c5cb47da # Parent bcdea45a14cbcde7e7d7d1af31e4e6c110a9ba61 Fix unitialized data accesses. diff -r bcdea45a14cb -r e40227e994e2 src/dmgrowbuf.c --- 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; diff -r bcdea45a14cb -r e40227e994e2 tools/lib64gfx.c --- 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) ||