Bug 956961 - FileDescriptorToFILE should always use its input. r=bent

2014-07-02 11:22:40 -07:00
parent a7ef68b624
commit bf85f6f7c0
1 changed files with 3 additions and 1 deletions
--- a/ipc/glue/FileDescriptorUtils.cpp
+++ b/ipc/glue/FileDescriptorUtils.cpp
@@ -91,11 +91,13 @@ FILE*
 FileDescriptorToFILE(const FileDescriptor& aDesc,
                     const char* aOpenMode)
 {
+  // Debug builds check whether the handle was "used", even if it's
+  // invalid, so that needs to happen first.
+  FileDescriptor::PlatformHandleType handle = aDesc.PlatformHandle();
  if (!aDesc.IsValid()) {
    errno = EBADF;
    return nullptr;
  }
-  FileDescriptor::PlatformHandleType handle = aDesc.PlatformHandle();
 #ifdef XP_WIN
  int fd = _open_osfhandle(reinterpret_cast<intptr_t>(handle), 0);
  if (fd == -1) {