Merge pull request #9071 from solenoglyph/hfsprogs

hfsprogs: Fix wide string literal in fsck_hfs
This commit is contained in:
Rosen Penev 2019-05-28 13:54:16 -07:00 committed by GitHub
commit 0353ca6833
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -0,0 +1,13 @@
Index: diskdev_cmds-332.25/fsck_hfs.tproj/dfalib/SVerify1.c
===================================================================
--- diskdev_cmds-332.25.orig/fsck_hfs.tproj/dfalib/SVerify1.c
+++ diskdev_cmds-332.25/fsck_hfs.tproj/dfalib/SVerify1.c
@@ -2848,7 +2848,7 @@ OSErr VLockedChk( SGlobPtr GPtr )
}
else // Because we don't have the unicode converters, just fill it with a dummy name.
{
- CopyMemory( "\x0dPure HFS Plus", calculatedVCB->vcbVN, sizeof(Str27) );
+ CopyMemory( u"\x0dPure HFS Plus", calculatedVCB->vcbVN, sizeof(Str27) );
}
GPtr->TarBlock = hint;