kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix operator precedence error in cmELF

Browse Source 
When attempting to load the RPATH out of a non-ELF file cmELF would
crash because the check for a valid file was done with in correct
operator precedence.  See bug#7392.
This commit is contained in:
Brad King 2008-08-04 09:38:38 -04:00
parent acd9e9e5e9
commit 0c20967a6b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmELF.cxx
View File

@ -884,8 +884,8 @@ cmELF::StringEntry const* cmELF::GetSOName()
cmELF::StringEntry const* cmELF::GetRPath() cmELF::StringEntry const* cmELF::GetRPath()
{ {
if(this->Valid() && if(this->Valid() &&
this->Internal->GetFileType() == cmELF::FileTypeExecutable || (this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary) this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary))
{ {
return this->Internal->GetRPath(); return this->Internal->GetRPath();
} }
@ -899,8 +899,8 @@ cmELF::StringEntry const* cmELF::GetRPath()
cmELF::StringEntry const* cmELF::GetRunPath() cmELF::StringEntry const* cmELF::GetRunPath()
{ {
if(this->Valid() && if(this->Valid() &&
this->Internal->GetFileType() == cmELF::FileTypeExecutable || (this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary) this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary))
{ {
return this->Internal->GetRunPath(); return this->Internal->GetRunPath();
} }