resolved issue 2941813 re: incorrect internal HFS case sensitive flags

sleuthkit · Mar 23, 2010 · c3adb4a · c3adb4a
1 parent e536877
commit c3adb4a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/NEWS.txt b/NEWS.txt
@@ -12,6 +12,7 @@ multiple volume descriptors are processed.
 - 2955898: Orphan files not found if no deleted file names exist. 
 - 2955899: NTFS internal setting of USED flag. 
 - 2972721: Sorter fails with hash lookup if '-l' is given. 
+- 2941813: Reverse HFS case sensitive flags (internal fix only)
 
 
 ---------------- VERSION 3.1.0 --------------

diff --git a/tsk3/fs/hfs.c b/tsk3/fs/hfs.c
@@ -3130,9 +3130,9 @@ hfs_open(TSK_IMG_INFO * img_info, TSK_OFF_T offset,
         hfs->is_case_sensitive = 0;
     else if (tsk_getu16(fs->endian, hfs->fs->version) == HFS_VH_VER_HFSX) {
         if (hfs->catalog_header.compType == HFS_BT_HEAD_COMP_SENS)
-            hfs->is_case_sensitive = 0;
-        else if (hfs->catalog_header.compType == HFS_BT_HEAD_COMP_INSENS)
             hfs->is_case_sensitive = 1;
+        else if (hfs->catalog_header.compType == HFS_BT_HEAD_COMP_INSENS)
+            hfs->is_case_sensitive = 0;
         else {
             tsk_fprintf(stderr,
                 "hfs_open: invalid value (0x%02" PRIx8

diff --git a/tsk3/fs/tsk_hfs.h b/tsk3/fs/tsk_hfs.h
@@ -367,8 +367,8 @@ typedef struct {
 #define HFS_BT_HEAD_TYPE_RSV    255
 
 // compType values
-#define HFS_BT_HEAD_COMP_SENS    0xCF   // case sensitive
-#define HFS_BT_HEAD_COMP_INSENS    0xBC // case insensitive
+#define HFS_BT_HEAD_COMP_SENS    0xBC   // case sensitive
+#define HFS_BT_HEAD_COMP_INSENS    0xC7 // case insensitive
 
 // attr values
 #define HFS_BT_HEAD_ATTR_BIGKEYS 0x00000002     /* key length field is 16 bits (req'd for HFS+) */