i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oldSet shouldn't be changed in case of error. Thanks axel for noticing

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18533 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-08-18 09:37:32 +00:00
parent 0ce93ee730
commit c941d45cd5
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/signal.c
+5 -6
View File
@@ -385,12 +385,7 @@ sigprocmask(int how, const sigset_t *set, sigset_t *oldSet)
struct thread *thread = thread_get_current_thread(); struct thread *thread = thread_get_current_thread();
sigset_t oldMask = atomic_get(&thread->sig_block_mask); sigset_t oldMask = atomic_get(&thread->sig_block_mask);
if (oldSet != NULL) if (set != NULL) {
*oldSet = oldMask;
if (set == NULL)
return B_OK;
switch (how) { switch (how) {
case SIG_BLOCK: case SIG_BLOCK:
atomic_or(&thread->sig_block_mask, *set & BLOCKABLE_SIGNALS); atomic_or(&thread->sig_block_mask, *set & BLOCKABLE_SIGNALS);
@@ -404,6 +399,10 @@ sigprocmask(int how, const sigset_t *set, sigset_t *oldSet)
default: default:
return B_BAD_VALUE; return B_BAD_VALUE;
} }
}
if (oldSet != NULL)
*oldSet = oldMask;
return B_OK; return B_OK;
} }