Fix hard-to-understand code in VG_(load_ELF)().

Although it is a valid C [1], the closing bracket for "case PT_INTERP" is misplaced.
Fixes BZ #350854.

[1] https://en.wikipedia.org/wiki/Duff%27s_device#Mechanism

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15467

diff --git a/NEWS b/NEWS
index 85a5a384ca30cc0a3b818d75a614095b4b9639e7..71f120e1f6ff6bdc06b96a811411cb855334cdbe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -272,6 +272,7 @@ where XXXXXX is the bug number as listed below.
 350809  Fix none/tests/async-sigs for Solaris
 350811  Remove reference to --db-attach which has been removed.
 350813  Use handwritten memcheck assembly helpers on x86/Solaris in addition to {arm,x86}-linux
+350854  hard-to-understand code in VG_(load_ELF)()
 n-i-bz  Provide implementations of certain compiler builtins to support
         compilers who may not provide those
 n-i-bz  Old STABS code is still being compiled, but never used. Remove it.

diff --git a/coregrind/m_ume/elf.c b/coregrind/m_ume/elf.c
index 051670199a82643c35a38b2746d4dbd883d4e9b1..ee4b4e18173fb6b40693aff04586f5c9607fa821 100644 (file)
--- a/coregrind/m_ume/elf.c
+++ b/coregrind/m_ume/elf.c
@@ -443,6 +443,7 @@ Int VG_(load_ELF)(Int fd, const HChar* name, /*MOD*/ExeInfo* info)
                interp_size = end;
          }
          break;
+         }
 
 #     if defined(PT_GNU_STACK) || defined(PT_SUNWSTACK)
 #     if defined(PT_GNU_STACK)
@@ -463,7 +464,6 @@ Int VG_(load_ELF)(Int fd, const HChar* name, /*MOD*/ExeInfo* info)
          // do nothing
          break;
       }
-      }
    }
 
    if (info->phdr == 0)