Fix translator crash when provided empty file

It's checking file for emptiness before translating Signed-off-by: Ilya Mashkov <ilya.mashkov@intel.com>
KhronosGroup · Oct 25, 2019 · 9b898c6 · 9b898c6
1 parent 4581205
commit 9b898c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/test/check_empty_file.ll b/test/check_empty_file.ll
@@ -0,0 +1,3 @@
+; RUN: not llvm-spirv %S/empty_file.bc -o - 2>&1 | FileCheck %s
+
+; CHECK: Can't translate, file is empty
diff --git a/test/empty_file.bc b/test/empty_file.bc
diff --git a/tools/llvm-spirv/llvm-spirv.cpp b/tools/llvm-spirv/llvm-spirv.cpp
@@ -177,6 +177,11 @@ static int convertLLVMToSPIRV(const SPIRV::TranslatorOpts &Opts) {
   return 0;
 }
 
+static bool isFileEmpty(const std::string &FileName) {
+  std::ifstream File(FileName);
+  return File && File.peek() == EOF;
+}
+
 static int convertSPIRVToLLVM(const SPIRV::TranslatorOpts &Opts) {
   LLVMContext Context;
   std::ifstream IFS(InputFile, std::ios::binary);
@@ -351,6 +356,11 @@ int main(int Ac, char **Av) {
 
   cl::ParseCommandLineOptions(Ac, Av, "LLVM/SPIR-V translator");
 
+  if (InputFile != "-" && isFileEmpty(InputFile)) {
+    errs() << "Can't translate, file is empty\n";
+    return -1;
+  }
+
   SPIRV::TranslatorOpts::ExtensionsStatusMap ExtensionsStatus;
   // ExtensionsStatus will be properly initialized and update according to
   // values passed via --spirv-ext option in parseSPVExtOption function.