linuxdeploy · tmnku · Feb 12, 2022 · Feb 13, 2022 · Sep 29, 2022 · TheAssassin
diff --git a/src/core/elf_file.cpp b/src/core/elf_file.cpp
@@ -161,8 +161,8 @@ namespace linuxdeploy {
 
             ElfFile::ElfFile(const std::filesystem::path& path) {
                 // check if file exists
-                if (!fs::exists(path))
-                    throw ElfFileParseError("No such file or directory: " + path.string());
+                if (!fs::is_regular_file(path))
+                    throw ElfFileParseError("No such file: " + path.string());
 
                 // check magic bytes
                 std::ifstream ifs(path.string());
@@ -173,7 +173,7 @@ namespace linuxdeploy {
                 ifs.read(magicBytes.data(), 4);
 
                 if (strncmp(magicBytes.data(), "\177ELF", 4) != 0)
-                    throw ElfFileParseError("Invalid magic bytes in file header");
+                    throw ElfFileParseError("Invalid magic bytes in header of file: " + path.string());
 
                 d = new PrivateData(path);
                 d->readDataUsingElfAPI();

diff --git a/tests/core/CMakeLists.txt b/tests/core/CMakeLists.txt
@@ -18,6 +18,7 @@ function(ld_core_add_test_executable NAME)
         -DSIMPLE_ICON_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_icon.svg"
         -DSIMPLE_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/simple_file.txt"
         -DREADONLY_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/readonly-file.txt"
+        -DEMPTY_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../data/empty-file.txt"
     )
 
     # make sure library and executable are built before test_appdir

diff --git a/tests/core/test_elf_file.cpp b/tests/core/test_elf_file.cpp
@@ -24,11 +24,11 @@ namespace {
     }
 
     void expectThrowsElfFileErrorInvalidElfHeader(const char* path) {
-        expectElfFileConstructorThrowMessage(path, "Invalid magic bytes in file header");
+        expectElfFileConstructorThrowMessage(path, "Invalid magic bytes in header of file: ");
     }
 
     void expectThrowsElfFileErrorFileNotFound(const char* path) {
-        expectElfFileConstructorThrowMessage(path, "No such file or directory: ");
+        expectElfFileConstructorThrowMessage(path, "No such file: ");
     }
 }
 
@@ -52,7 +52,7 @@ namespace LinuxDeployTest {
     }
 
     TEST_F(ElfFileTest, checkInvalidElfHeaderOnEmptyFile) {
-        expectThrowsElfFileErrorInvalidElfHeader("/dev/null");
+        expectThrowsElfFileErrorInvalidElfHeader(EMPTY_FILE_PATH);
     }
 
     TEST_F(ElfFileTest, checkInvalidElfHeaderOnRandomFiles) {

diff --git a/tests/data/empty-file.txt b/tests/data/empty-file.txt