Changeset 6d9ab345 in rtems

Timestamp:

Mar 18, 2013, 2:19:35 PM (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

df6818f9

Parents:

c2015b44

git-author:

Sebastian Huber <sebastian.huber@…> (03/18/13 14:19:35)

git-committer:

Sebastian Huber <sebastian.huber@…> (03/18/13 15:26:31)

Message:

IMFS: Fix NULL pointer access

File:

• cpukit/libfs/src/imfs/memfile.c (modified) (4 diffs)

cpukit/libfs/src/imfs/memfile.c

@@ -40 +40 @@
 );
 
-MEMFILE_STATIC int IMFS_memfile_remove_block(
+MEMFILE_STATIC void IMFS_memfile_remove_block(
    IMFS_jnode_t  *the_jnode,
    unsigned int   block
@@ -274 +274 @@
    */
   block_entry_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 1 );
+  if ( !block_entry_ptr )
+    return 1;
+
   if ( *block_entry_ptr )
     return 0;
@@ -298 +301 @@
  *         dangerous and the results unpredictable.
  */
-MEMFILE_STATIC int IMFS_memfile_remove_block(
+MEMFILE_STATIC void IMFS_memfile_remove_block(
    IMFS_jnode_t  *the_jnode,
    unsigned int   block
@@ -307 +310 @@
 
   block_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 0 );
-  IMFS_assert( block_ptr );
-
-  ptr = *block_ptr;
-  *block_ptr = 0;
-  memfile_free_block( ptr );
-
-  return 1;
+  if ( block_ptr ) {
+    ptr = *block_ptr;
+    *block_ptr = 0;
+    memfile_free_block( ptr );
+  }
 }