tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpc: remove silly use of ReadVarint in subscription ID generator (#21391)

Browse Source 
Found by @protolambda
This commit is contained in:
Felix Lange 2020-07-31 16:20:31 +02:00 committed by GitHub
parent a00dc5095b
commit 9c2ac6fbd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpc/subscription.go
View File

@ -17,7 +17,6 @@
package rpc package rpc
import ( import (
"bufio"
"container/list" "container/list"
"context" "context"
crand "crypto/rand" crand "crypto/rand"
@ -51,10 +50,14 @@ func NewID() ID {
// randomIDGenerator returns a function generates a random IDs. // randomIDGenerator returns a function generates a random IDs.
func randomIDGenerator() func() ID { func randomIDGenerator() func() ID {
seed, err := binary.ReadVarint(bufio.NewReader(crand.Reader)) var buf = make([]byte, 8)
if err != nil { var seed int64
if _, err := crand.Read(buf); err == nil {
seed = int64(binary.BigEndian.Uint64(buf))
} else {
seed = int64(time.Now().Nanosecond()) seed = int64(time.Now().Nanosecond())
} }
var ( var (
mu sync.Mutex mu sync.Mutex
rng = rand.New(rand.NewSource(seed)) rng = rand.New(rand.NewSource(seed))