Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix decoding lists of TRUE values #122

Merged
merged 3 commits into from
Apr 26, 2022
Merged

fix decoding lists of TRUE values #122

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b26f89
fix decoding lists of TRUE values
Apr 26, 2022
438c1c1
fix typo
Apr 26, 2022
c6d11a5
minimal code change
Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions thrift/decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"fmt"
"io"
"io/ioutil"
"math/bits"
"reflect"
"sync/atomic"
)
Expand Down Expand Up @@ -219,6 +218,15 @@ func decodeFuncSliceOf(t reflect.Type, seen decodeFuncCache) decodeFunc {
return err
}

// Sometimes the list type is set to TRUE when the list contains only
// TRUE values. Thrift does not seem to optimize the encoding by
// omitting the boolean values that are known to all be TRUE, we still
// need to decode them.
switch l.Type {
case TRUE:
l.Type = BOOL
}

// TODO: implement type conversions?
if typ != l.Type {
if flags.have(strict) {
Expand Down Expand Up @@ -314,6 +322,13 @@ func decodeFuncMapAsSetOf(t reflect.Type, seen decodeFuncCache) decodeFunc {
return err
}

// See decodeFuncSliceOf for details about why this type conversion
// needs to be done.
switch s.Type {
case TRUE:
s.Type = BOOL
}

v.Set(reflect.MakeMapWithSize(t, int(s.Size)))

if s.Size == 0 {
Expand Down Expand Up @@ -415,8 +430,12 @@ func (dec *structDecoder) decode(r Reader, v reflect.Value, flags flags) error {

for i, required := range dec.required {
if mask := required & seen[i]; mask != required {
index := bits.TrailingZeros64(mask)
field := &dec.fields[i+index]
i *= 64
for (mask & 1) != 0 {
mask >>= 1
i++
}
field := &dec.fields[i]
Comment on lines +433 to +438
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a fix for another bug: the error was reporting the wrong field ID.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth amending the commit or nah

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we're fine, this code is going to live on Github "forever", the context is here.

return &MissingField{Field: Field{ID: field.id, Type: field.typ}}
}
}
Expand Down