From 9863397d9b203a33d2ee28c2204ed489b15edb33 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Sun, 25 Jan 2009 03:59:32 +0000
Subject: [PATCH] fs_dir_add now does not check meta_addr when adding (BUG:
 2534449)

---
 CHANGES.txt      | 4 ++++
 tsk3/fs/fs_dir.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0651b5cb6..2d78efca3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,10 @@ to meta type).  (Bug: 2389901). Reported by Barry Grundy.
 
 1/12/09: Bug Fix: Fixed ISO9660 bug where large directory contents were not displayed.  (Bug: 2503552).  Reported by Tom Black. 
 
+1/24/09: Bug Fix: Fixed bug 2534449 where extra NTFS files were
+shown if the MFT address was changed to 0 because fs_dir_add was
+checking the address and name.  Reported by Andy Bontoft.
+
 
 ---------------- VERSION 3.0.0 -------------- 
 0/00/00: Update: Many, many, many API changes.
diff --git a/tsk3/fs/fs_dir.c b/tsk3/fs/fs_dir.c
index 6e1e741d1..ce2cd4c21 100644
--- a/tsk3/fs/fs_dir.c
+++ b/tsk3/fs/fs_dir.c
@@ -102,8 +102,7 @@ tsk_fs_dir_add(TSK_FS_DIR * a_fs_dir, const TSK_FS_NAME * a_fs_name)
 
     // see if we already have it in the buffer / queue
     for (i = 0; i < a_fs_dir->names_used; i++) {
-        if ((a_fs_name->meta_addr == a_fs_dir->names[i].meta_addr) &&
-            (strcmp(a_fs_name->name, a_fs_dir->names[i].name) == 0)) {
+        if (strcmp(a_fs_name->name, a_fs_dir->names[i].name) == 0) {
 
             /* We do not check type because then we cannot detect NTFS orphan file
              * duplicates that are added as "-/r" while a similar entry exists as "r/r"  
-- 
GitLab