Changeset 69613 in vbox for trunk/src/VBox/Devices/EFI/Firmware

Timestamp:

Nov 8, 2017 12:11:36 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

118973

Message:

EFI/HFS: Fixed a problem with null character comparison on HFS+ volumes which in rare cases led to a failure to access most files on the volume.

File:

• trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.c (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.c

@@ -37 +37 @@
 
 #ifdef HOST_POSIX
+#include <assert.h>
 #define DPRINT(x) printf(x)
 #define DPRINT2(x,y) printf(x,y)
-#define BP(msg)    do { printf("ERROR: %s", msg); asm("int3"); } while (0)
+#define BP(msg)    do { printf("ERROR: %s", msg); assert(0); } while (0)
 #elif defined DEBUG_LEVEL
 #define CONCAT(x,y) x##y
@@ -928 +929 @@
   while(1)
   {
-    /* get next valid character from ckey1 */
+    /* get next valid (non-zero) character from ckey1 */
     for (lc = 0; lc == 0 && apos < key1Len; apos++) {
       ac = be16_to_cpu(p1[apos]);
-      lc = ac ? fsw_to_lower(ac) : 0;
+      lc = fsw_to_lower(ac);    /* NB: 0x0000 is translated to 0xffff */
     };
     ac = (fsw_u16)lc;
 
-    /* get next valid character from ckey2 */
+    /* get next valid (non-zero) character from ckey2 */
     for (lc = 0; lc == 0 && bpos < ckey2->nodeName.length; bpos++) {
       bc = p2[bpos];
-      lc = bc ? fsw_to_lower(bc) : 0;
+      lc = fsw_to_lower(bc);    /* NB: 0x0000 is translated to 0xffff */
     };
     bc = (fsw_u16)lc;