From: Florian Krohm <florian@eich-krohm.de>
Date: Wed, 19 Aug 2015 10:09:08 +0000 (+0000)
Subject: Fix comparison in function VG_(iseqsigset).
X-Git-Tag: svn/VALGRIND_3_11_0~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c715bf33ee85139c59c0a1e7700b4c5826523e7;p=thirdparty%2Fvalgrind.git

Fix comparison in function VG_(iseqsigset).
Patch by dcb314@hotmail.com
Fixes BZ #351474.


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

diff --git a/NEWS b/NEWS
index 2c2ea7ca47..f760fd1d53 100644
--- a/NEWS
+++ b/NEWS
@@ -307,6 +307,7 @@ where XXXXXX is the bug number as listed below.
 350854  hard-to-understand code in VG_(load_ELF)()
 351140  arm64 syscalls setuid (146) and setresgid (149) not implemented
 351386  Cannot run ld.so.1 under Valgrind
+351474  Fix VG_(iseqsigset) as obvious
 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_libcsignal.c b/coregrind/m_libcsignal.c
index b84bc083a3..8c5b7f6b65 100644
--- a/coregrind/m_libcsignal.c
+++ b/coregrind/m_libcsignal.c
@@ -131,7 +131,7 @@ Bool VG_(iseqsigset)( const vki_sigset_t* set1, const vki_sigset_t* set2 )
       else {
          /* Partial word comparison. */
          ULong mask = (1UL << (_VKI_MAXSIG % _VKI_NSIG_BPW)) - 1;
-         if ((set1->sig[i] & mask) != (set1->sig[i] & mask)) return False;
+         if ((set1->sig[i] & mask) != (set2->sig[i] & mask)) return False;
          break;
       }
    }