From d79ef179dc5f73821e96e3cbf063e90a21901ecb Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 23 Mar 2001 14:02:02 +0000
Subject: 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.
---
 c/src/exec/libfs/ChangeLog          | 8 ++++++++
 c/src/exec/libfs/src/imfs/memfile.c | 2 ++
 c/src/libfs/ChangeLog               | 8 ++++++++
 c/src/libfs/src/imfs/memfile.c      | 2 ++
 4 files changed, 20 insertions(+)

(limited to 'c')

diff --git a/c/src/exec/libfs/ChangeLog b/c/src/exec/libfs/ChangeLog
index 8a39874a0a..5dc5dbf9c1 100644
--- a/c/src/exec/libfs/ChangeLog
+++ b/c/src/exec/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/c/src/exec/libfs/src/imfs/memfile.c b/c/src/exec/libfs/src/imfs/memfile.c
index 8ae7e5e6ba..fc2680fcfe 100644
--- a/c/src/exec/libfs/src/imfs/memfile.c
+++ b/c/src/exec/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);
diff --git a/c/src/libfs/ChangeLog b/c/src/libfs/ChangeLog
index 8a39874a0a..5dc5dbf9c1 100644
--- a/c/src/libfs/ChangeLog
+++ b/c/src/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/c/src/libfs/src/imfs/memfile.c b/c/src/libfs/src/imfs/memfile.c
index 8ae7e5e6ba..fc2680fcfe 100644
--- a/c/src/libfs/src/imfs/memfile.c
+++ b/c/src/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);
-- 
cgit v1.2.3