Embedded/elua
1
0
Fork 0
mirror of https://github.com/elua/elua.git synced 2025-01-08 20:56:17 +08:00
Code Issues Projects Releases Wiki Activity

fixed potential double dm_closedir calls

Browse Source
This commit is contained in:
Bogdan Marinescu 2013-01-14 22:22:51 +02:00
parent af77642dd8
commit 6b2add7141
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common_fs.c
View File

@ -9,6 +9,12 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#define SAFE_CLOSEDIR( dir ) \
do { \
dm_closedir( dir ); \
dir = NULL; \
} while( 0 )
// Returns 1 if 'str' matches the given pattern, 0 otherwise // Returns 1 if 'str' matches the given pattern, 0 otherwise
// '?' matches a single char // '?' matches a single char
// "*" matches one or more chars, NON-GREEDY // "*" matches one or more chars, NON-GREEDY
@ -214,7 +220,7 @@ static int cmn_fs_actual_walkdir( const char *path, const char *pattern, p_cmn_f
if( isdir ) if( isdir )
hasdirs = 1; hasdirs = 1;
} }
dm_closedir( d ); SAFE_CLOSEDIR( d );
if( cb( path, ent, pdata, CMN_FS_INFO_AFTER_CLOSEDIR ) == 0 ) if( cb( path, ent, pdata, CMN_FS_INFO_AFTER_CLOSEDIR ) == 0 )
goto abort; goto abort;
if( recursive && hasdirs ) if( recursive && hasdirs )
@ -237,7 +243,7 @@ static int cmn_fs_actual_walkdir( const char *path, const char *pattern, p_cmn_f
goto abort; goto abort;
} }
} }
dm_closedir( d ); SAFE_CLOSEDIR( d );
} }
else else
if( cb( path, NULL, pdata, CMN_FS_INFO_OPENDIR_FAILED ) == 0 ) if( cb( path, NULL, pdata, CMN_FS_INFO_OPENDIR_FAILED ) == 0 )
@ -251,7 +257,8 @@ static int cmn_fs_actual_walkdir( const char *path, const char *pattern, p_cmn_f
return 0; return 0;
return 1; return 1;
abort: abort:
dm_closedir( d ); if( d )
dm_closedir( d );
return 0; return 0;
} }
@ -269,7 +276,6 @@ int cmn_fs_walkdir( const char *path, p_cmn_fs_walker_cb cb, void *pdata, int re
int cmn_fs_is_root_dir( const char *path ) int cmn_fs_is_root_dir( const char *path )
{ {
if( !path ) if( !path )
return 0; return 0;
if( path[ 0 ] != '/' ) if( path[ 0 ] != '/' )