diff options
| author | Brad King <brad.king@kitware.com> | 2008-08-04 13:38:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-08-04 13:38:38 (GMT) |
| commit | 0c20967a6bda705ee5779483047b6ff3c3d58730 (patch) | |
| tree | 7e544c2b6ff6163d281b562058087e5c1abddd09 /Source/cmELF.cxx | |
| parent | acd9e9e5e9a7236ae33ef86a2314c1eae3ce89a4 (diff) | |
| download | CMake-0c20967a6bda705ee5779483047b6ff3c3d58730.zip CMake-0c20967a6bda705ee5779483047b6ff3c3d58730.tar.gz CMake-0c20967a6bda705ee5779483047b6ff3c3d58730.tar.bz2 | |
BUG: Fix operator precedence error in cmELF
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.
Diffstat (limited to 'Source/cmELF.cxx')
| -rw-r--r-- | Source/cmELF.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index 083470c..3dff59c 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -884,8 +884,8 @@ cmELF::StringEntry const* cmELF::GetSOName() cmELF::StringEntry const* cmELF::GetRPath() { if(this->Valid() && - this->Internal->GetFileType() == cmELF::FileTypeExecutable || - this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary) + (this->Internal->GetFileType() == cmELF::FileTypeExecutable || + this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary)) { return this->Internal->GetRPath(); } @@ -899,8 +899,8 @@ cmELF::StringEntry const* cmELF::GetRPath() cmELF::StringEntry const* cmELF::GetRunPath() { if(this->Valid() && - this->Internal->GetFileType() == cmELF::FileTypeExecutable || - this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary) + (this->Internal->GetFileType() == cmELF::FileTypeExecutable || + this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary)) { return this->Internal->GetRunPath(); } |