From 2acaf987eb8e23cbc489d14613b32f152465eb26 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Tue, 20 Aug 2002 20:49:10 +0000 Subject: [PATCH] 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 --- vg_mylibc.c | 6 +++--- vg_scheduler.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vg_mylibc.c b/vg_mylibc.c index e32aee8d10..da63d4c2e8 100644 --- 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 1275511271..e3790d7709 100644 --- 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; } -- 2.47.2