jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix: slice bounds out of range 

If TestGenerateName() accept size parameter larger than 64, it will panic.
This patch fix this potential panic bug.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
This commit is contained in:
Zhang Wei 2015-05-30 11:50:15 +08:00
parent 60d043931b
commit 9c2893eb28
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils/utils.go
View File

@ -21,6 +21,9 @@ func GenerateRandomName(prefix string, size int) (string, error) {
if _, err := io.ReadFull(rand.Reader, id); err != nil { if _, err := io.ReadFull(rand.Reader, id); err != nil {
return "", err return "", err
} }
if size > 64 {
size = 64
}
return prefix + hex.EncodeToString(id)[:size], nil return prefix + hex.EncodeToString(id)[:size], nil
} }

12
utils/utils_test.go
View File

@ -9,7 +9,17 @@ func TestGenerateName(t *testing.T) {
} }
expected := 5 + len("veth") expected := 5 + len("veth")
if len(name) != 5+len("veth") { if len(name) != expected {
t.Fatalf("expected name to be %d chars but received %d", expected, len(name))
}
name, err = GenerateRandomName("veth", 65)
if err != nil {
t.Fatal(err)
}
expected = 64 + len("veth")
if len(name) != expected {
t.Fatalf("expected name to be %d chars but received %d", expected, len(name)) t.Fatalf("expected name to be %d chars but received %d", expected, len(name))
} }
} }