diff options
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/libfs/ChangeLog | 8 | ||||
| -rw-r--r-- | cpukit/libfs/src/imfs/memfile.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog index 8a39874a0a..5dc5dbf9c1 100644 --- a/cpukit/libfs/ChangeLog +++ b/cpukit/libfs/ChangeLog @@ -1,3 +1,11 @@ +2001-03-23 Joel Sherrill <joel@OARcorp.com> + + * src/imfs/memfile.c: Reapply fix from bug report from + Jose Sturniolo <jsturnio@nec.com.ar> where NULL pointer + was dereferenced when freeing a triply indirect file. + The fix was applied to the 4.5 release branch and not + the development branch. + 2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * src/imfs/Makefile.am: Apply include_*HEADERS instead of H_FILES. diff --git a/cpukit/libfs/src/imfs/memfile.c b/cpukit/libfs/src/imfs/memfile.c index 8ae7e5e6ba..fc2680fcfe 100644 --- a/cpukit/libfs/src/imfs/memfile.c +++ b/cpukit/libfs/src/imfs/memfile.c @@ -509,6 +509,8 @@ int IMFS_memfile_remove( if ( info->triply_indirect ) { for ( i=0 ; i<IMFS_MEMFILE_BLOCK_SLOTS ; i++ ) { p = (block_p *) info->triply_indirect[i]; + if ( !p ) /* ensure we have a valid pointer */ + break; for ( j=0 ; j<IMFS_MEMFILE_BLOCK_SLOTS ; j++ ) { if ( p[j] ) { memfile_free_blocks_in_table( (block_p **)&p[j], to_free); |