qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-07 08:21:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't seg when extracting conchars (it's not really a miptex)

Browse source
This commit is contained in:
Bill Currie 2009-12-21 14:03:33 +00:00 committed by Jeff Teunissen
parent 52b2631341
commit c9484af217
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/wad/wad.c
View file

@ -232,6 +232,7 @@ wad_extract (wad_t *wad, lumpinfo_t *pf)
static dstring_t name = {&dstring_default_mem, 0, 0, 0}; static dstring_t name = {&dstring_default_mem, 0, 0, 0};
size_t count; size_t count;
int len, i; int len, i;
unsigned width, height;
unsigned u; unsigned u;
QFile *file; QFile *file;
byte *buffer; byte *buffer;
@ -301,6 +302,22 @@ wad_extract (wad_t *wad, lumpinfo_t *pf)
buffer = malloc (pf->size); buffer = malloc (pf->size);
Qread (wad->handle, buffer, pf->size); Qread (wad->handle, buffer, pf->size);
miptex = (miptex_t *) buffer; miptex = (miptex_t *) buffer;
width = LittleLong (miptex->width);
height = LittleLong (miptex->height);
if (width > (unsigned) pf->size || height > (unsigned) pf->size
|| (width * height * 3 / 2
+ sizeof (miptex_t)) > (unsigned) pf->size) {
if (options.verbosity)
fprintf (stderr, "bogus MIPTEX. treating as raw data\n");
if (Qwrite (file, buffer, pf->size) != pf->size) {
fprintf (stderr, "Error writing to %s\n", name.str);
return -1;
}
Qclose (file);
return 0;
}
miptex->width = width;
miptex->height = height;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
miptex->offsets[i] = LittleLong (miptex->offsets[i]); miptex->offsets[i] = LittleLong (miptex->offsets[i]);
if (options.verbosity > 1) if (options.verbosity > 1)