[Cmake-commits] [cmake-commits] king committed cmELF.cxx 1.12 1.13

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv9647/Source

Modified Files:
	cmELF.cxx 
Log Message:
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.


Index: cmELF.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmELF.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmELF.cxx	13 May 2008 14:34:24 -0000	1.12
--- cmELF.cxx	4 Aug 2008 13:38:38 -0000	1.13
***************
*** 885,890 ****
  {
    if(this->Valid() &&
!      this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
!      this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary)
      {
      return this->Internal->GetRPath();
--- 885,890 ----
  {
    if(this->Valid() &&
!      (this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
!       this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary))
      {
      return this->Internal->GetRPath();
***************
*** 900,905 ****
  {
    if(this->Valid() &&
!      this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
!      this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary)
      {
      return this->Internal->GetRunPath();
--- 900,905 ----
  {
    if(this->Valid() &&
!      (this->Internal->GetFileType() == cmELF::FileTypeExecutable ||
!       this->Internal->GetFileType() == cmELF::FileTypeSharedLibrary))
      {
      return this->Internal->GetRunPath();