Changeset 22728

Timestamp:

10/25/07 18:01:16 (13 months ago)

Author:

bonefish

Message:

Patch by Vasilis Kaoutsis: Check for a valid signal number before
doing something. If the signal is not valid, set errno and return -1.
Mini style changes by myself.

Files:

• haiku/trunk/src/system/libroot/posix/signal/sigset.c (modified) (4 diffs)

haiku/trunk/src/system/libroot/posix/signal/sigset.c

@@ -8 +8 @@
 
 
+#include <errno.h>
 #include <signal.h>
-
 #include <syscalls.h>
 
@@ -32 +32 @@
 sigismember(const sigset_t *set, int sig)
 {
-        sigset_t mask = (((sigset_t) 1) << (( sig ) - 1)) ;
+        sigset_t mask;
+
+        if (sig <= 0 || sig >= NSIG) {
+                        errno = EINVAL;
+                        return -1;
+        }
+
+        mask = (((sigset_t)1) << (sig - 1)) ;
         return (*set & mask) ? 1 : 0 ;
 }
@@ -40 +47 @@
 sigaddset(sigset_t *set, int sig)
 {
-        sigset_t mask = (((sigset_t) 1) << (( sig ) - 1)) ;
+        sigset_t mask;
+
+        if (sig <= 0 || sig >= NSIG) {
+                        errno = EINVAL;
+                        return -1;
+        }
+
+        mask = (((sigset_t)1) << (sig - 1)) ;
         *set |= mask;
         return 0;
@@ -49 +63 @@
 sigdelset(sigset_t *set, int sig)
 {
-        sigset_t mask = (((sigset_t) 1) << (( sig ) - 1)) ;
+        sigset_t mask;
+
+        if (sig <= 0 || sig >= NSIG) {
+                        errno = EINVAL;
+                        return -1;
+        }
+
+        mask = (((sigset_t)1) << (sig - 1)) ;
         *set &= ~mask;
         return 0;
 }
-