Index: lib/Object/COFFObjectFile.cpp
===================================================================
--- lib/Object/COFFObjectFile.cpp
+++ lib/Object/COFFObjectFile.cpp
@@ -718,6 +718,9 @@
     }
     if ((EC = getObject(DataDirectory, Data, DataDirAddr, DataDirSize)))
       return;
+  }
+
+  if (COFFHeader) {
     CurPtr += COFFHeader->SizeOfOptionalHeader;
   }