ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1656 from tpounds/bug-fix-prevent-neg-hash-all-operations 

helper/schema: Prevent negative hashcodes for all set operations.
This commit is contained in:
Mitchell Hashimoto 2015-04-28 20:49:53 -07:00
parent 5d4c67c462 17b31925fe
commit b96027ac87
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
helper/schema/set.go
View File

@ -34,7 +34,7 @@ func (s *Set) Add(item interface{}) {
// Contains checks if the set has the given item.
func (s *Set) Contains(item interface{}) bool {
_, ok := s.m[s.F(item)]
_, ok := s.m[s.hash(item)]
return ok
}
@ -122,10 +122,7 @@ func (s *Set) init() {
func (s *Set) add(item interface{}) int {
s.once.Do(s.init)
code := s.F(item)
if code < 0 {
code *= -1
}
code := s.hash(item)
if _, ok := s.m[code]; !ok {
s.m[code] = item
}
@ -133,8 +130,17 @@ func (s *Set) add(item interface{}) int {
return code
}
func (s *Set) hash(item interface{}) int {
code := s.F(item)
// Always return a nonnegative hashcode.
if code < 0 {
return -code
}
return code
}
func (s *Set) index(item interface{}) int {
return sort.SearchInts(s.listCode(), s.F(item))
return sort.SearchInts(s.listCode(), s.hash(item))
}
func (s *Set) listCode() []int {

4
helper/schema/set_test.go
View File

@ -35,6 +35,7 @@ func TestSetAdd_negative(t *testing.T) {
func TestSetContains(t *testing.T) {
s := &Set{F: testSetInt}
s.Add(5)
s.Add(-5)
if s.Contains(2) {
t.Fatal("should not contain")
@ -42,6 +43,9 @@ func TestSetContains(t *testing.T) {
if !s.Contains(5) {
t.Fatal("should contain")
}
if !s.Contains(-5) {
t.Fatal("should contain")
}
}
func TestSetDifference(t *testing.T) {