[PECOFF] Export ordinal must be in the range 1 through 65535.

llvm-svn: 197365

2 files changed, 12 insertions, 1 deletions

diff --git a/lld/lib/Driver/WinLinkDriver.cpp b/lld/lib/Driver/WinLinkDriver.cpp
index fbc6bfc01fc..79b006ddf85 100644
--- a/lld/lib/Driver/WinLinkDriver.cpp
+++ b/lld/lib/Driver/WinLinkDriver.cpp
@@ -328,6 +328,8 @@ bool parseExport(StringRef option, PECOFFLinkingContext::ExportDesc &ret) {
       int ordinal;
       if (arg.substr(1).getAsInteger(0, ordinal))
         return false;
+      if (ordinal <= 0 || 65535 < ordinal)
+        return false;
       ret.ordinal = ordinal;
       continue;
     }
@@ -878,7 +880,8 @@ WinLinkDriver::parse(int argc, const char *argv[], PECOFFLinkingContext &ctx,
     case OPT_export: {
       PECOFFLinkingContext::ExportDesc desc;
       if (!parseExport(inputArg->getValue(), desc)) {
-        diagnostics << "Error: malformed /export option\n";
+        diagnostics << "Error: malformed /export option: "
+                    << inputArg->getValue() << "\n";
         return false;
       }
       ctx.addDllExport(desc);
diff --git a/lld/unittests/DriverTests/WinLinkDriverTest.cpp b/lld/unittests/DriverTests/WinLinkDriverTest.cpp
index e31dffdddea..011ca414ff8 100644
--- a/lld/unittests/DriverTests/WinLinkDriverTest.cpp
+++ b/lld/unittests/DriverTests/WinLinkDriverTest.cpp
@@ -183,6 +183,14 @@ TEST_F(WinLinkParserTest, ExportWithOptions) {
   EXPECT_TRUE(exports[1].isData);
 }
 
+TEST_F(WinLinkParserTest, ExportInvalid1) {
+  EXPECT_FALSE(parse("link.exe", "/export:foo,@0", "a.out", nullptr));
+}
+
+TEST_F(WinLinkParserTest, ExportInvalid2) {
+  EXPECT_FALSE(parse("link.exe", "/export:foo,@65536", "a.out", nullptr));
+}
+
 TEST_F(WinLinkParserTest, MachineX86) {
   EXPECT_TRUE(parse("link.exe", "/machine:x86", "a.obj", nullptr));
   EXPECT_EQ(llvm::COFF::IMAGE_FILE_MACHINE_I386, _context.getMachineType());