go-pkg/cmux
2
0
Fork 0
mirror of https://github.com/soheilhy/cmux.git synced 2024-11-14 11:31:28 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33 from soheilhy/fix-b32

Browse Source 
Fix index out of range in patricia tree
This commit is contained in:
Soheil Hassas Yeganeh 2016-07-15 11:38:34 -07:00 committed by GitHub
commit b26951527b
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patricia.go
View File

@ -161,6 +161,10 @@ func (n *ptNode) match(b []byte, prefix bool) bool {
return true return true
} }
if l >= len(b) {
return false
}
nextN, ok := n.next[b[l]] nextN, ok := n.next[b[l]]
if !ok { if !ok {
return false return false

9
patricia_test.go
View File

@ -33,6 +33,13 @@ func testPTree(t *testing.T, strs ...string) {
if pt.match(strings.NewReader(s + s)) { if pt.match(strings.NewReader(s + s)) {
t.Errorf("%s matches %s", s+s, s) t.Errorf("%s matches %s", s+s, s)
} }
// The following tests are just to catch index out of
// range and off-by-one errors and not the functionality.
pt.matchPrefix(strings.NewReader(s[:len(s)-1]))
pt.match(strings.NewReader(s[:len(s)-1]))
pt.matchPrefix(strings.NewReader(s + "$"))
pt.match(strings.NewReader(s + "$"))
} }
} }
@ -45,5 +52,5 @@ func TestPatriciaNonOverlapping(t *testing.T) {
} }
func TestPatriciaOverlapping(t *testing.T) { func TestPatriciaOverlapping(t *testing.T) {
testPTree(t, "foo", "far", "farther", "boo", "bar") testPTree(t, "foo", "far", "farther", "boo", "ba", "bar")
} }