scuti/lib3ddevil1
1
0
Fork 0
mirror of https://notabug.org/scuti/lib3ddevil1 synced 2025-05-31 14:11:42 +05:30
Code Issues Actions Packages Projects Releases Wiki Activity

Merged a/iosanitycheck into master

Browse Source
This commit is contained in:
surkeh
2018-04-19 16:08:36 -07:00
parent 6afa14c124 9b70b10565
commit f77c2f8920
6 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/devil1geo.c
View File

@@ -14,7 +14,7 @@ static bool getmeshheader(struct MeshHeader**, unsigned int i, const char * cons
static bool getmeshbatch(struct Batch*, unsigned int offset, const char * const);
static bool getmesh(struct Mesh*, unsigned int i, const char*);
static bool getmesh(struct Mesh*, unsigned int i, const char*, unsigned int filesize);
fn_devil1geo const DEVIL1GEO = {printgheader,
printmeshheader,
@@ -115,7 +115,8 @@ static bool getmeshbatch(struct Batch *b,
// assume client has allocated memory for mesh
static bool getmesh(struct Mesh *m,
unsigned int i,
const char * const filedata) {
const char * const filedata,
unsigned int filesize) {
bool done = false;
if (m == NULL || filedata == NULL || m -> b == NULL) {
return done;
@@ -127,6 +128,9 @@ static bool getmesh(struct Mesh *m,
struct Batch b;
for (j = 0; j < mh -> numBatch; j++) {
unsigned int offset = mh->offsetBatches + j * sizeof(struct BatchData);
if (offset > filesize) {
return done;
}
getmeshbatch(&b, offset, filedata);
// printmeshbatch(&b);
m -> b[j] = b;

4
src/devil1pld.c
View File

@@ -14,7 +14,9 @@ static bool getpldh(struct PldHeader *ph, const char *filedata) {
if (ph != NULL && filedata != NULL) {
ph -> numOffset = (int32_t)filedata[0];
ph -> offsets = (uint32_t*)(filedata + sizeof(int32_t));
good = true;
if ( ph->numOffset > 0 ) {
good = true;
}
}
return good;
}

2
src/devil1tex.c
View File

@@ -63,7 +63,7 @@ static bool gettexdescriptor(struct TextureBatchDescriptor **descriptor,
bool done = false;
unsigned int offset = sizeof(struct TexturePack);
offset += sizeof(struct TextureBatchDescriptor) * i;
if (filedata != NULL) {
if (filedata != NULL && offset <= filesize) {
*descriptor = (struct TextureBatchDescriptor*)(filedata + offset);
done = true;
}