Resolve panics in list binding indexes #2666
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jacalz
reviewed
Nov 29, 2021
data/binding/bindlists.go
Outdated
Comment on lines
1073
to
1285
| for i := oldLen; i < newLen; i++ { | ||
| l.appendItem(bindUntypedListItem(l.val, i, l.updateExternal)) | ||
| } | ||
| l.trigger() | ||
| } | ||
|
|
||
| for i, item := range l.items { | ||
| if i > oldLen || i > newLen { | ||
| break | ||
| } | ||
|
|
||
| var err error | ||
| if l.updateExternal { | ||
| item.(*boundExternalUntypedListItem).lock.Lock() | ||
| err = item.(*boundExternalUntypedListItem).setIfChanged((*l.val)[i]) | ||
| item.(*boundExternalUntypedListItem).lock.Unlock() | ||
| } else { | ||
| item.(*boundUntypedListItem).lock.Lock() | ||
| err = item.(*boundUntypedListItem).doSet((*l.val)[i]) | ||
| item.(*boundUntypedListItem).lock.Unlock() | ||
| } | ||
| if err != nil { | ||
| retErr = err | ||
| } | ||
| } | ||
| return | ||
| } | ||
|
|
||
| func (l *boundUntypedList) SetValue(i int, v interface{}) error { | ||
| if i < 0 || i >= l.Length() { | ||
| return errOutOfBounds | ||
| } | ||
|
|
||
| l.lock.Lock() | ||
| (*l.val)[i] = v | ||
| l.lock.Unlock() | ||
|
|
||
| item, err := l.GetItem(i) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return item.(Untyped).Set(v) | ||
| } | ||
|
|
||
| func bindUntypedListItem(v *[]interface{}, i int, external bool) Untyped { | ||
| if external { | ||
| ret := &boundExternalUntypedListItem{old: (*v)[i]} | ||
| ret.val = v | ||
| ret.index = i | ||
| return ret | ||
| } | ||
|
|
||
| return &boundUntypedListItem{val: v, index: i} | ||
| } | ||
|
|
||
| type boundUntypedListItem struct { | ||
| base | ||
|
|
||
| val *[]interface{} | ||
| index int | ||
| } | ||
|
|
||
| func (b *boundUntypedListItem) Get() (interface{}, error) { | ||
| b.lock.Lock() | ||
| defer b.lock.Unlock() | ||
|
|
||
| return (*b.val)[b.index], nil | ||
| } | ||
|
|
||
| func (b *boundUntypedListItem) Set(val interface{}) error { | ||
| b.lock.Lock() | ||
| defer b.lock.Unlock() | ||
|
|
||
| return b.doSet(val) | ||
| } | ||
|
|
||
| func (b *boundUntypedListItem) doSet(val interface{}) error { | ||
| (*b.val)[b.index] = val | ||
|
|
||
| b.trigger() | ||
| return nil | ||
| } | ||
|
|
||
| type boundExternalUntypedListItem struct { | ||
| boundUntypedListItem | ||
|
|
||
| old interface{} | ||
| } | ||
|
|
||
| func (b *boundExternalUntypedListItem) setIfChanged(val interface{}) error { | ||
| if val == b.old { | ||
| return nil | ||
| } | ||
| (*b.val)[b.index] = val | ||
| b.old = val | ||
|
|
||
| b.trigger() | ||
| return nil | ||
| } | ||
|
|
There was a problem hiding this comment.
Was this supposed to be removed?
There was a problem hiding this comment.
No, I wonder why the automated scripts are doing that. Will revert and then investigate later.
There was a problem hiding this comment.
Seems like somehow that item was never added to the generator script. Fixed :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2643
Checklist: