archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Possible fix for [#24924] crash-Fluids

Browse Source 
* In some rare cases gzread has problems with the fluid files. This could be minor file corruption or some strange thread issue, but checking the amount of read bytes always after read seems to give a graceful way out.
This commit is contained in:
Janne Karhu
2011-01-13 10:10:13 +00:00
parent f373dd6a50
commit 9024b6789e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/modifiers/intern/MOD_fluidsim_util.c
View File

@@ -169,7 +169,7 @@ void fluidsim_free(FluidsimModifierData *fluidmd)
/* read .bobj.gz file into a fluidsimDerivedMesh struct */
DerivedMesh *fluidsim_read_obj(char *filename)
{
int wri,i,j;
int wri = 0,i,j;
float wrf;
int gotBytes;
gzFile gzf;
@@ -193,28 +193,30 @@ DerivedMesh *fluidsim_read_obj(char *filename)
numverts = wri;
// skip verts
for(i=0; i<numverts*3; i++)
for(i=0; i<numverts*3 && gotBytes; i++)
{
gotBytes = gzread(gzf, &wrf, sizeof( wrf ));
}
// read number of normals
gotBytes = gzread(gzf, &wri, sizeof(wri));
if(gotBytes)
gotBytes = gzread(gzf, &wri, sizeof(wri));
// skip normals
for(i=0; i<numverts*3; i++)
for(i=0; i<numverts*3 && gotBytes; i++)
{
gotBytes = gzread(gzf, &wrf, sizeof( wrf ));
}
/* get no. of triangles */
gotBytes = gzread(gzf, &wri, sizeof(wri));
if(gotBytes)
gotBytes = gzread(gzf, &wri, sizeof(wri));
numfaces = wri;
gzclose( gzf );
// ------------------------------------------------
if(!numfaces || !numverts)
if(!numfaces || !numverts || !gotBytes)
return NULL;
gzf = gzopen(filename, "rb");