v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be more tolerant to invalid input

pull/2825/head
bzt 2019-12-13 06:38:49 +01:00
parent 7a83e89b02
commit 30634ff56e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/M3D/m3d.h
View File

@ -2994,11 +2994,11 @@ asciiend:
while(buff < end && !M3D_CHUNKMAGIC(buff, 'O','M','D','3')) { while(buff < end && !M3D_CHUNKMAGIC(buff, 'O','M','D','3')) {
data = buff; data = buff;
len = ((m3dchunk_t*)data)->length; len = ((m3dchunk_t*)data)->length;
if(len < sizeof(m3dchunk_t)) { buff += len;
if(len < sizeof(m3dchunk_t) || buff >= end) {
M3D_LOG("Invalid chunk size"); M3D_LOG("Invalid chunk size");
break; break;
} }
buff += len;
len -= sizeof(m3dchunk_t) + model->si_s; len -= sizeof(m3dchunk_t) + model->si_s;
/* inlined assets */ /* inlined assets */
@ -3024,11 +3024,11 @@ memerr: M3D_LOG("Out of memory");
while(chunk < end && !M3D_CHUNKMAGIC(chunk, 'O','M','D','3')) { while(chunk < end && !M3D_CHUNKMAGIC(chunk, 'O','M','D','3')) {
data = chunk; data = chunk;
len = ((m3dchunk_t*)chunk)->length; len = ((m3dchunk_t*)chunk)->length;
if(len < sizeof(m3dchunk_t)) { chunk += len;
if(len < sizeof(m3dchunk_t) || chunk >= end) {
M3D_LOG("Invalid chunk size"); M3D_LOG("Invalid chunk size");
break; break;
} }
chunk += len;
len -= sizeof(m3dchunk_t); len -= sizeof(m3dchunk_t);
/* preview chunk */ /* preview chunk */