cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-22 16:09:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

runtime: remove always false comparison in sigsend

Browse Source 
s is a uint32 and can never be zero. It's max value is already tested
against sig.wanted, whose size is derived from _NSIG.  This also
matches the test in signal_enable.

Fixes #11282

Change-Id: I8eec9c7df8eb8682433616462fe51b264c092475
Reviewed-on: https://go-review.googlesource.com/13940
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Todd Neal 2015-08-25 18:25:42 -05:00 committed by Ian Lance Taylor
parent af78482d6b
commit a94e906c41
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/sigqueue.go
View File

@ -49,7 +49,7 @@ const (
// Reports whether the signal was sent. If not, the caller typically crashes the program. // Reports whether the signal was sent. If not, the caller typically crashes the program.
func sigsend(s uint32) bool { func sigsend(s uint32) bool {
bit := uint32(1) << uint(s&31) bit := uint32(1) << uint(s&31)
if !sig.inuse || s < 0 || int(s) >= 32*len(sig.wanted) || sig.wanted[s/32]&bit == 0 { if !sig.inuse || s >= uint32(32*len(sig.wanted)) || sig.wanted[s/32]&bit == 0 {
return false return false
} }
@ -137,7 +137,7 @@ func signal_enable(s uint32) {
return return
} }
if int(s) >= len(sig.wanted)*32 { if s >= uint32(len(sig.wanted)*32) {
return return
} }
sig.wanted[s/32] |= 1 << (s & 31) sig.wanted[s/32] |= 1 << (s & 31)
@ -146,7 +146,7 @@ func signal_enable(s uint32) {
// Must only be called from a single goroutine at a time. // Must only be called from a single goroutine at a time.
func signal_disable(s uint32) { func signal_disable(s uint32) {
if int(s) >= len(sig.wanted)*32 { if s >= uint32(len(sig.wanted)*32) {
return return
} }
sig.wanted[s/32] &^= 1 << (s & 31) sig.wanted[s/32] &^= 1 << (s & 31)
@ -155,7 +155,7 @@ func signal_disable(s uint32) {
// Must only be called from a single goroutine at a time. // Must only be called from a single goroutine at a time.
func signal_ignore(s uint32) { func signal_ignore(s uint32) {
if int(s) >= len(sig.wanted)*32 { if s >= uint32(len(sig.wanted)*32) {
return return
} }
sig.wanted[s/32] &^= 1 << (s & 31) sig.wanted[s/32] &^= 1 << (s & 31)