generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 7e22db03: Merge "Fix an off-by-one error in the sigset_t function error handling."

Browse Source 
* commit '7e22db037e6d9ab117bf5d50c7aca85fe74941a0':
  Fix an off-by-one error in the sigset_t function error handling.
This commit is contained in:
Elliott Hughes
2013-01-07 14:21:26 -08:00
committed by Android Git Automerger
parent 2458d06fc1 7e22db037e
commit 79cecbd421
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libc/include/signal.h
View File

@@ -58,34 +58,34 @@ extern const char* const sys_siglist[];
extern const char* const sys_signame[];
static __inline__ int sigismember(sigset_t* set, int signum) {
if (set == NULL || signum < 1 || signum >= 8*sizeof(sigset_t)) {
int bit = signum - 1; // Signal numbers start at 1, but bit positions start at 0.
if (set == NULL || bit < 0 || bit >= 8*sizeof(sigset_t)) {
errno = EINVAL;
return -1;
}
unsigned long* local_set = (unsigned long*) set;
signum--;
return (int) ((local_set[signum/LONG_BIT] >> (signum%LONG_BIT)) & 1);
return (int) ((local_set[bit / LONG_BIT] >> (bit % LONG_BIT)) & 1);
}
static __inline__ int sigaddset(sigset_t* set, int signum) {
if (set == NULL || signum < 1 || signum >= 8*sizeof(sigset_t)) {
int bit = signum - 1; // Signal numbers start at 1, but bit positions start at 0.
if (set == NULL || bit < 0 || bit >= 8*sizeof(sigset_t)) {
errno = EINVAL;
return -1;
}
unsigned long* local_set = (unsigned long*) set;
signum--;
local_set[signum/LONG_BIT] |= 1UL << (signum%LONG_BIT);
local_set[bit / LONG_BIT] |= 1UL << (bit % LONG_BIT);
return 0;
}
static __inline__ int sigdelset(sigset_t* set, int signum) {
if (set == NULL || signum < 1 || signum >= 8*sizeof(sigset_t)) {
int bit = signum - 1; // Signal numbers start at 1, but bit positions start at 0.
if (set == NULL || bit < 0 || bit >= 8*sizeof(sigset_t)) {
errno = EINVAL;
return -1;
}
unsigned long* local_set = (unsigned long*) set;
signum--;
local_set[signum/LONG_BIT] &= ~(1UL << (signum%LONG_BIT));
local_set[bit / LONG_BIT] &= ~(1UL << (bit % LONG_BIT));
return 0;
}