X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FHBDVDDetector.m;h=81a854597343eec37db18910cb0ac5abeed808b7;hb=240cf3308bf21be4d1918a71a5510d07e7d6d85b;hp=fb9541dabcd310c3ec3b87c4446b8c54f387cdc0;hpb=4906f3cbbca02adbb6216427f810e3e63adb633c;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/macosx/HBDVDDetector.m b/macosx/HBDVDDetector.m
index fb9541da..81a85459 100644
--- a/macosx/HBDVDDetector.m
+++ b/macosx/HBDVDDetector.m
@@ -112,7 +112,18 @@
 
     // A version 4 GetVolParmsInfoBuffer contains the BSD node name in the vMDeviceID field.
     // It is actually a char * value. This is mentioned in the header CoreServices/CarbonCore/Files.h.
-    return [NSString stringWithCString:(char *)volumeParms.vMDeviceID];
+    if( volumeParms.vMVersion < 4 )
+    {
+        return nil;
+    }
+
+    // vMDeviceID might be zero as is reported with experimental ZFS (zfs-119) support in Leopard.
+    if( !volumeParms.vMDeviceID )
+    {
+        return nil;
+    }
+
+    return [NSString stringWithUTF8String:(const char *)volumeParms.vMDeviceID];
 }