Merge pull request #607 from WeiZhang555/bug

bug fix: slice bounds out of range
This commit is contained in:
Alexander Morozov 2015-05-30 08:30:58 -07:00
commit 3d47519162
2 changed files with 14 additions and 1 deletions

View File

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

View File

@ -9,7 +9,17 @@ func TestGenerateName(t *testing.T) {
}
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))
}
}