diff --git a/chkfont.c b/chkfont.c index 26e4606..47bbefb 100644 --- a/chkfont.c +++ b/chkfont.c @@ -106,6 +106,9 @@ exit(1); } +/* Don't warn on unitialized expected_width and expected_endmark */ +#pragma GCC diagnostic ignored "-Wuninitialized" + void readchar() { int i,expected_width,k,len,newlen,diff,l; diff --git a/figlet.c b/figlet.c index f582423..88760bd 100644 --- a/figlet.c +++ b/figlet.c @@ -1539,6 +1539,7 @@ void splitline() part1 = (inchr*)myalloc(sizeof(inchr)*(inchrlinelen+1)); part2 = (inchr*)myalloc(sizeof(inchr)*(inchrlinelen+1)); gotspace = 0; + lastspace = inchrlinelen-1; for (i=inchrlinelen-1;i>=0;i--) { if (!gotspace && inchrline[i]==' ') { gotspace = 1; diff --git a/zipio.c b/zipio.c index f4438ce..f7406d9 100644 --- a/zipio.c +++ b/zipio.c @@ -35,6 +35,7 @@ * * Changes from 1.1.1 to 1.1.2: * Relicensed under the MIT license, with consent of the copyright holders. + * Avoid usage of unitialized "length" variable in _Zgetc * Claudio Matsuoka (Jan 11 2011) */ @@ -681,11 +682,11 @@ int _Zgetc(ZFILE *stream) /* If data isn't in current outbuf, get it */ offset = ZS->fileposition & ~((long) (OUTBUFSIZE-1)); + length = ZS->usiz - offset; + if (length > OUTBUFSIZE) length = OUTBUFSIZE; + if (ZS->getoff != offset) { - length = ZS->usiz - offset; - if (length > OUTBUFSIZE) length = OUTBUFSIZE; - if (BufferRead(ZS, offset, ZS->getbuf, length)) return -1; ZS->getoff = offset;