17 |
|
|
18 |
|
#include "color.h" |
19 |
|
|
20 |
+ |
#ifdef getc_unlocked /* avoid horrendous overhead of flockfile */ |
21 |
+ |
#undef getc |
22 |
+ |
#undef putc |
23 |
+ |
#define getc getc_unlocked |
24 |
+ |
#define putc putc_unlocked |
25 |
+ |
#endif |
26 |
+ |
|
27 |
|
#define MINELEN 8 /* minimum scanline length for encoding */ |
28 |
|
#define MAXELEN 0x7fff /* maximum scanline length for encoding */ |
29 |
|
#define MINRUN 4 /* minimum run length */ |
56 |
|
register int i, j, beg, cnt = 1; |
57 |
|
int c2; |
58 |
|
|
59 |
< |
if (len < MINELEN | len > MAXELEN) /* OOBs, write out flat */ |
59 |
> |
if ((len < MINELEN) | (len > MAXELEN)) /* OOBs, write out flat */ |
60 |
|
return(fwrite((char *)scanline,sizeof(COLR),len,fp) - len); |
61 |
|
/* put magic header */ |
62 |
|
putc(2, fp); |
146 |
|
register int i, j; |
147 |
|
int code, val; |
148 |
|
/* determine scanline type */ |
149 |
< |
if (len < MINELEN | len > MAXELEN) |
149 |
> |
if ((len < MINELEN) | (len > MAXELEN)) |
150 |
|
return(oldreadcolrs(scanline, len, fp)); |
151 |
|
if ((i = getc(fp)) == EOF) |
152 |
|
return(-1); |
174 |
|
code &= 127; |
175 |
|
if ((val = getc(fp)) == EOF) |
176 |
|
return -1; |
177 |
+ |
if (j + code > len) |
178 |
+ |
return -1; /* overrun */ |
179 |
|
while (code--) |
180 |
|
scanline[j++][i] = val; |
181 |
< |
} else /* non-run */ |
181 |
> |
} else { /* non-run */ |
182 |
> |
if (j + code > len) |
183 |
> |
return -1; /* overrun */ |
184 |
|
while (code--) { |
185 |
|
if ((val = getc(fp)) == EOF) |
186 |
|
return -1; |
187 |
|
scanline[j++][i] = val; |
188 |
|
} |
189 |
+ |
} |
190 |
|
} |
191 |
|
return(0); |
192 |
|
} |