Fix a bunch of bogus boundary checks of the form

   if (n < lower_limit && n > upper_limit) {
      /* error case */
   }

The && should really be ||s.

MERGE TO HEAD

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_1_0_BRANCH@609

diff --git a/vg_mylibc.c b/vg_mylibc.c
index e32aee8d101f335636f27d76344044acf7cb101b..da63d4c2e80f7a13554064348562f65304ea76d1 100644 (file)
--- a/vg_mylibc.c
+++ b/vg_mylibc.c
@@ -177,7 +177,7 @@ Int VG_(ksigaddset)( vki_ksigset_t* set, Int signum )
 {
    if (set == NULL)
       return -1;
-   if (signum < 1 && signum > VKI_KNSIG)
+   if (signum < 1 || signum > VKI_KNSIG)
       return -1;
    signum--;
    set->ws[signum / VKI_KNSIG_BPW] |= (1 << (signum % VKI_KNSIG_BPW));
@@ -188,7 +188,7 @@ Int VG_(ksigdelset)( vki_ksigset_t* set, Int signum )
 {
    if (set == NULL)
       return -1;
-   if (signum < 1 && signum > VKI_KNSIG)
+   if (signum < 1 || signum > VKI_KNSIG)
       return -1;
    signum--;
    set->ws[signum / VKI_KNSIG_BPW] &= ~(1 << (signum % VKI_KNSIG_BPW));
@@ -199,7 +199,7 @@ Int VG_(ksigismember) ( vki_ksigset_t* set, Int signum )
 {
    if (set == NULL)
       return 0;
-   if (signum < 1 && signum > VKI_KNSIG)
+   if (signum < 1 || signum > VKI_KNSIG)
       return 0;
    signum--;
    if (1 & ((set->ws[signum / VKI_KNSIG_BPW]) >> (signum % VKI_KNSIG_BPW)))

diff --git a/vg_scheduler.c b/vg_scheduler.c
index 1275511271a1473f884ae8132319c54f366d1b4f..e3790d77093b2f806dc275df8a47958fe5a97ca0 100644 (file)
--- a/vg_scheduler.c
+++ b/vg_scheduler.c
@@ -3010,7 +3010,7 @@ void do__set_fhstack_entry ( ThreadId tid, Int n, ForkHandlerEntry* fh )
       }
    }
 
-   if (n < 0 && n >= VG_N_FORKHANDLERSTACK) {
+   if (n < 0 || n >= VG_N_FORKHANDLERSTACK) {
       SET_EDX(tid, -1);
       return;
    } 
@@ -3043,7 +3043,7 @@ void do__get_fhstack_entry ( ThreadId tid, Int n, /*OUT*/
       }
    }
 
-   if (n < 0 && n >= VG_N_FORKHANDLERSTACK) {
+   if (n < 0 || n >= VG_N_FORKHANDLERSTACK) {
       SET_EDX(tid, -1);
       return;
    }