patch-2.0.34 linux/fs/ext2/namei.c

• Lines: 15
• Date: Wed Jun 3 15:17:49 1998
• Orig file: v2.0.33/linux/fs/ext2/namei.c
• Orig date: Mon Aug 4 12:30:53 1997

diff -u --recursive --new-file v2.0.33/linux/fs/ext2/namei.c linux/fs/ext2/namei.c
@@ -573,12 +573,13 @@
 	    	ext2_warning (inode->i_sb, "empty_dir",
 			      "bad directory (dir #%lu) - no `.' or `..'",
 			      inode->i_ino);
+		brelse (bh);
 		return 1;
 	}
 	offset = de->rec_len + de1->rec_len;
 	de = (struct ext2_dir_entry *) ((char *) de1 + de1->rec_len);
 	while (offset < inode->i_size ) {
-		if ((void *) de >= (void *) (bh->b_data + sb->s_blocksize)) {
+		if (!bh || (void *) de >= (void *) (bh->b_data + sb->s_blocksize)) {
 			brelse (bh);
 			bh = ext2_bread (inode, offset >> EXT2_BLOCK_SIZE_BITS(sb), 1, &err);
 			if (!bh) {