Changeset 2281 for trunk/eraser

Timestamp:

1/1/2011 1:33:34 AM (2 years ago)

Author:

lowjoel

Message:

Forward-port from Eraser 6.0: Don't allow the UnauthorizedAccessException? to propagate up the stack; this is a problem which getting the length of the file may trigger, and for such situations, return 0.

Location:

trunk/eraser

Files:

• . (modified) (1 prop)
• Eraser.Util/StreamInfo.cs (modified) (1 diff)

trunk/eraser/Eraser.Util/StreamInfo.cs

@@ -164 +164 @@
             get
             {
-                long fileSize;
-                using (SafeFileHandle handle = OpenHandle(
-                    FileMode.Open, FileAccess.Read, FileShare.ReadWrite, FileOptions.None))
+                try
                 {
-                    if (NativeMethods.GetFileSizeEx(handle, out fileSize))
-                        return fileSize;
+                    using (SafeFileHandle handle = OpenHandle(
+                        FileMode.Open, FileAccess.Read, FileShare.ReadWrite, FileOptions.None))
+                    {
+                        long fileSize;
+                        if (NativeMethods.GetFileSizeEx(handle, out fileSize))
+                            return fileSize;
+                    }
+                }
+                catch (UnauthorizedAccessException)
+                {
+                    //Swallow: we just return 0 in this situation as there's nothing we can
+                    //do about this error.
                 }