From 5aa7b7b6da5fd541baf13a1555c0aa9a6580babf Mon Sep 17 00:00:00 2001 From: Marcus Overhagen Date: Thu, 27 Sep 2007 13:33:47 +0000 Subject: [PATCH] Fix broken build and the compiler warning "enumeral mismatch in conditional expression". git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22332 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/runtime_loader/elf.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/system/runtime_loader/elf.cpp b/src/system/runtime_loader/elf.cpp index 5b976d5617..02e8c547e8 100644 --- a/src/system/runtime_loader/elf.cpp +++ b/src/system/runtime_loader/elf.cpp @@ -9,6 +9,7 @@ #include "runtime_loader_private.h" +#include "vm.h" #include @@ -257,7 +258,10 @@ parse_elf_header(struct Elf32_Ehdr *eheader, int32 *_pheaderSize, int32 *_sheade *_pheaderSize = eheader->e_phentsize * eheader->e_phnum; *_sheaderSize = eheader->e_shentsize * eheader->e_shnum; - return *_pheaderSize > 0 && *_sheaderSize > 0 ? B_OK : B_NOT_AN_EXECUTABLE; + if (*_pheaderSize <= 0 || *_sheaderSize <= 0) + return B_NOT_AN_EXECUTABLE; + + return B_OK; }