quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix double free on PICO model parsing error

Browse Source
This commit is contained in:
Garux 2021-03-13 14:54:59 +03:00
parent 4f5f5649dc
commit a5fb9388c2
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libs/picomodel/picomodel.c
View File

@ -140,43 +140,38 @@ void PicoSetPrintFunc( void ( *func )( int, const char* ) ){
picoModel_t *PicoModuleLoadModel( const picoModule_t* pm, const char* fileName, picoByte_t* buffer, int bufSize, int frameNum ){ picoModel_t *PicoModuleLoadModel( const picoModule_t* pm, const char* fileName, const picoByte_t* buffer, int bufSize, int frameNum ){
char *modelFileName, *remapFileName; char *modelFileName, *remapFileName;
/* see whether this module can load the model file or not */ /* see whether this module can load the model file or not */
if ( pm->canload( fileName, buffer, bufSize ) == PICO_PMV_OK ) { if ( pm->canload( fileName, buffer, bufSize ) == PICO_PMV_OK ) {
/* use loader provided by module to read the model data */ /* use loader provided by module to read the model data */
picoModel_t* model = pm->load( fileName, frameNum, buffer, bufSize ); picoModel_t* model = pm->load( fileName, frameNum, buffer, bufSize );
if ( model == NULL ) { if ( model != NULL ) {
_pico_free_file( buffer ); /* assign pointer to file format module */
return NULL; model->module = pm;
}
/* assign pointer to file format module */ /* get model file name */
model->module = pm; modelFileName = PicoGetModelFileName( model );
/* get model file name */ /* apply model remappings from <model>.remap */
modelFileName = PicoGetModelFileName( model ); if ( strlen( modelFileName ) ) {
/* alloc copy of model file name */
remapFileName = _pico_alloc( strlen( modelFileName ) + 20 );
if ( remapFileName != NULL ) {
/* copy model file name and change extension */
strcpy( remapFileName, modelFileName );
_pico_setfext( remapFileName, "remap" );
/* apply model remappings from <model>.remap */ /* try to remap model; we don't handle the result */
if ( strlen( modelFileName ) ) { PicoRemapModel( model, remapFileName );
/* alloc copy of model file name */
remapFileName = _pico_alloc( strlen( modelFileName ) + 20 );
if ( remapFileName != NULL ) {
/* copy model file name and change extension */
strcpy( remapFileName, modelFileName );
_pico_setfext( remapFileName, "remap" );
/* try to remap model; we don't handle the result */ /* free the remap file name string */
PicoRemapModel( model, remapFileName ); _pico_free( remapFileName );
}
/* free the remap file name string */
_pico_free( remapFileName );
} }
_pico_deduce_shadernames( model );
} }
_pico_deduce_shadernames( model );
return model; return model;
} }
@ -239,9 +234,7 @@ picoModel_t *PicoLoadModel( const char *fileName, int frameNum ){
} }
/* free memory used by file buffer */ /* free memory used by file buffer */
if ( buffer ) { _pico_free_file( buffer );
_pico_free_file( buffer );
}
/* return */ /* return */
return model; return model;
@ -273,9 +266,7 @@ picoModel_t *PicoModuleLoadModelStream( const picoModule_t* module, void* inputS
model = PicoModuleLoadModel( module, fileName, buffer, bufSize, frameNum ); model = PicoModuleLoadModel( module, fileName, buffer, bufSize, frameNum );
if ( model != 0 ) { _pico_free( buffer );
_pico_free( buffer );
}
/* return */ /* return */
return model; return model;