Skip to content

Commit 9221c7f

Browse files
authored
chore: fix some bad conversions (#9703)
Be more defensive with type conversions. BEGIN_NESTED_COMMIT fix(pubsublite): fix int conversion END_NESTED_COMMIT BEGIN_NESTED_COMMIT fix(spanner): fix uint8 conversion END_NESTED_COMMIT BEGIN_NESTED_COMMIT fix(auth): fix uint32 conversion END_NESTED_COMMIT Fixes: #9704
1 parent 81830e6 commit 9221c7f

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

auth/httptransport/trace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (f *httpFormat) SpanContextFromRequest(req *http.Request) (sc trace.SpanCon
7777
if !strings.HasPrefix(h, "o=") {
7878
return sc, true
7979
}
80-
o, err := strconv.ParseUint(h[2:], 10, 64)
80+
o, err := strconv.ParseUint(h[2:], 10, 32)
8181
if err != nil {
8282
return trace.SpanContext{}, false
8383
}

pubsublite/pscompat/message.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,10 @@ func ParseMessageMetadata(id string) (*MessageMetadata, error) {
162162
if len(parts) != 2 {
163163
return nil, fmt.Errorf("pubsublite: invalid encoded message metadata %q", id)
164164
}
165-
166-
partition, pErr := strconv.ParseInt(parts[0], 10, 64)
165+
partition, pErr := strconv.Atoi(parts[0])
167166
offset, oErr := strconv.ParseInt(parts[1], 10, 64)
168167
if pErr != nil || oErr != nil {
169168
return nil, fmt.Errorf("pubsublite: invalid encoded message metadata %q", id)
170169
}
171-
return &MessageMetadata{Partition: int(partition), Offset: offset}, nil
170+
return &MessageMetadata{Partition: partition, Offset: offset}, nil
172171
}

spanner/spansql/parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ func (p *parser) consumeStringContent(delim string, raw, unicode bool, name stri
607607
if !(i+1 < len(p.s) && isHexDigit(p.s[i]) && isHexDigit(p.s[i+1])) {
608608
return "", p.errorf("illegal escape sequence: hex escape sequence must be followed by 2 hex digits")
609609
}
610-
c, err := strconv.ParseUint(p.s[i:i+2], 16, 64)
610+
c, err := strconv.ParseUint(p.s[i:i+2], 16, 8)
611611
if err != nil {
612612
return "", p.errorf("illegal escape sequence: invalid hex digits: %q: %v", p.s[i:i+2], err)
613613
}

0 commit comments

Comments
 (0)