LibDriver: Reject inputs that are not COFF objects or bitcode files.

[davide]

LGTM, thanks for making this stricter.

[davide]

llvm/lib/LibDriver/LibDriver.cpp

150–151 ↗

(On Diff #81469)

I wish libDriver had a diagnostic handler instead of accessing llvm::errs() directly here. Well, this seems widespread so better leave it as is.

llvm/trunk/lib/LibDriver/LibDriver.cpp

for (auto *Arg : Args.filtered(OPT_INPUT)) {
     Expected<NewArchiveMember> MOrErr =
         NewArchiveMember::getFile(Saver.save(*Path), /*Deterministic=*/true);
     if (!MOrErr) {
       handleAllErrors(MOrErr.takeError(), [&](const llvm::ErrorInfoBase &EIB) {
         llvm::errs() << Arg->getValue() << ": " << EIB.message() << "\n";
       });
       return 1;
     }
+    sys::fs::file_magic Magic =
+        sys::fs::identify_magic(MOrErr->Buf->getBuffer());
+    if (Magic != sys::fs::file_magic::coff_object &&
+        Magic != sys::fs::file_magic::bitcode) {
+      llvm::errs() << Arg->getValue() << ": not a COFF object or bitcode file\n";
+      return 1;
+    }
     Members.emplace_back(std::move(*MOrErr));
   }
 
   std::pair<StringRef, std::error_code> Result =
       llvm::writeArchive(getOutputPath(&Args, Members[0]), Members,
                          /*WriteSymtab=*/true, object::Archive::K_GNU,
                          /*Deterministic*/ true, Args.hasArg(OPT_llvmlibthin));
 

llvm/trunk/test/LibDriver/invalid.test

+RUN: not llvm-lib %S/Inputs/cl-gl.obj 2>&1 | FileCheck %s
+CHECK: not a COFF object or bitcode file

llvm/trunk/test/LibDriver/thin.test

-RUN: echo foo > %t
+RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t %S/Inputs/a.s
 
 RUN: llvm-lib  -out:%t.a %t
 RUN: FileCheck --check-prefix=FAT %s < %t.a
 FAT: !<arch>
 
 RUN: llvm-lib  -out:%t.thin.a -llvmlibthin %t
 RUN: FileCheck --check-prefix=THIN %s < %t.thin.a
 THIN: !<thin>