Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

fix(vm): avoid "index out of range" in convertArgToGno #2500

Merged
merged 7 commits into from
Jul 9, 2024
Merged

fix(vm): avoid "index out of range" in convertArgToGno #2500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6738ae8
fix(vm): avoid index-out-of-range in convertArgToGno
n0izn0iz Jul 4, 2024
522a9b5
chore: fmt
n0izn0iz Jul 4, 2024
76a8d8e
Merge branch 'master' into convert-empty-num-better-err
n0izn0iz Jul 4, 2024
ed7c133
Merge branch 'master' into convert-empty-num-better-err
n0izn0iz Jul 5, 2024
cc54615
chore: improve test
n0izn0iz Jul 5, 2024
29a3ea2
Merge branch 'master' into convert-empty-num-better-err
n0izn0iz Jul 6, 2024
076ff0c
Merge branch 'master' into convert-empty-num-better-err
n0izn0iz Jul 9, 2024
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
31 changes: 16 additions & 15 deletions gno.land/pkg/sdk/vm/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
"encoding/base64"
"fmt"
"strconv"
"strings"

"github.com/cockroachdb/apd/v3"
gno "github.com/gnolang/gno/gnovm/pkg/gnolang"
)

func assertCharNotPlus(b byte) {
if b == '+' {
func assertNoPlusPrefix(s string) {
if strings.HasPrefix(s, "+") {
panic("numbers cannot start with +")
}
}
Expand Down Expand Up @@ -41,7 +42,7 @@
tv.SetString(gno.StringValue(arg))
return
case gno.IntType:
assertCharNotPlus(arg[0])
assertNoPlusPrefix(arg)
i64, err := strconv.ParseInt(arg, 10, 64)
if err != nil {
panic(fmt.Sprintf(
Expand All @@ -51,7 +52,7 @@
tv.SetInt(int(i64))
return
case gno.Int8Type:
assertCharNotPlus(arg[0])
assertNoPlusPrefix(arg)
i8, err := strconv.ParseInt(arg, 10, 8)
if err != nil {
panic(fmt.Sprintf(
Expand All @@ -61,7 +62,7 @@
tv.SetInt8(int8(i8))
return
case gno.Int16Type:
assertCharNotPlus(arg[0])
assertNoPlusPrefix(arg)
i16, err := strconv.ParseInt(arg, 10, 16)
if err != nil {
panic(fmt.Sprintf(
Expand All @@ -71,7 +72,7 @@
tv.SetInt16(int16(i16))
return
case gno.Int32Type:
assertCharNotPlus(arg[0])
assertNoPlusPrefix(arg)
i32, err := strconv.ParseInt(arg, 10, 32)
if err != nil {
panic(fmt.Sprintf(
Expand All @@ -81,7 +82,7 @@
tv.SetInt32(int32(i32))
return
case gno.Int64Type:
assertCharNotPlus(arg[0])
assertNoPlusPrefix(arg)
i64, err := strconv.ParseInt(arg, 10, 64)
if err != nil {
panic(fmt.Sprintf(
Expand All @@ -91,7 +92,7 @@
tv.SetInt64(i64)
return
case gno.UintType:
assertCharNotPlus(arg[0])
assertNoPlusPrefix(arg)
u64, err := strconv.ParseUint(arg, 10, 64)
if err != nil {
panic(fmt.Sprintf(
Expand All @@ -101,7 +102,7 @@
tv.SetUint(uint(u64))
return
case gno.Uint8Type:
assertCharNotPlus(arg[0])
assertNoPlusPrefix(arg)
u8, err := strconv.ParseUint(arg, 10, 8)
if err != nil {
panic(fmt.Sprintf(
Expand All @@ -111,7 +112,7 @@
tv.SetUint8(uint8(u8))
return
case gno.Uint16Type:
assertCharNotPlus(arg[0])
assertNoPlusPrefix(arg)
u16, err := strconv.ParseUint(arg, 10, 16)
if err != nil {
panic(fmt.Sprintf(
Expand All @@ -121,7 +122,7 @@
tv.SetUint16(uint16(u16))
return
case gno.Uint32Type:
assertCharNotPlus(arg[0])
assertNoPlusPrefix(arg)
u32, err := strconv.ParseUint(arg, 10, 32)
if err != nil {
panic(fmt.Sprintf(
Expand All @@ -131,7 +132,7 @@
tv.SetUint32(uint32(u32))
return
case gno.Uint64Type:
assertCharNotPlus(arg[0])
assertNoPlusPrefix(arg)
u64, err := strconv.ParseUint(arg, 10, 64)
if err != nil {
panic(fmt.Sprintf(
Expand Down Expand Up @@ -192,15 +193,15 @@
}

func convertFloat(value string, precision int) float64 {
assertCharNotPlus(value[0])
assertNoPlusPrefix(value)
dec, _, err := apd.NewFromString(value)
if err != nil {
panic(fmt.Sprintf("error parsing float%d %s: %v", precision, value, err))
panic(fmt.Sprintf("error parsing float%d %q: %v", precision, value, err))
}

f64, err := strconv.ParseFloat(dec.String(), precision)
if err != nil {
panic(fmt.Sprintf("error value exceeds float%d precision %s: %v", precision, value, err))
panic(fmt.Sprintf("error value exceeds float%d precision %q: %v", precision, value, err))

Check warning on line 204 in gno.land/pkg/sdk/vm/convert.go

View check run for this annotation

Codecov / codecov/patch

gno.land/pkg/sdk/vm/convert.go#L204 

Added line #L204 was not covered by tests
}

return f64
Expand Down
39 changes: 39 additions & 0 deletions gno.land/pkg/sdk/vm/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package vm

import (
"fmt"
"testing"

"github.com/gnolang/gno/gnovm/pkg/gnolang"
"github.com/stretchr/testify/assert"
)

func TestConvertEmptyNumbers(t *testing.T) {
tests := []struct {
argT gnolang.Type
expectedErr string
}{
{gnolang.UintType, `error parsing uint "": strconv.ParseUint: parsing "": invalid syntax`},
{gnolang.Uint64Type, `error parsing uint64 "": strconv.ParseUint: parsing "": invalid syntax`},
{gnolang.Uint32Type, `error parsing uint32 "": strconv.ParseUint: parsing "": invalid syntax`},
{gnolang.Uint16Type, `error parsing uint16 "": strconv.ParseUint: parsing "": invalid syntax`},
{gnolang.Uint8Type, `error parsing uint8 "": strconv.ParseUint: parsing "": invalid syntax`},
{gnolang.IntType, `error parsing int "": strconv.ParseInt: parsing "": invalid syntax`},
{gnolang.Int64Type, `error parsing int64 "": strconv.ParseInt: parsing "": invalid syntax`},
{gnolang.Int32Type, `error parsing int32 "": strconv.ParseInt: parsing "": invalid syntax`},
{gnolang.Int16Type, `error parsing int16 "": strconv.ParseInt: parsing "": invalid syntax`},
{gnolang.Int8Type, `error parsing int8 "": strconv.ParseInt: parsing "": invalid syntax`},
{gnolang.Float64Type, `error parsing float64 "": parse mantissa: `},
{gnolang.Float32Type, `error parsing float32 "": parse mantissa: `},
}

for _, tt := range tests {
testname := fmt.Sprintf("%v", tt.argT)
t.Run(testname, func(t *testing.T) {
run := func() {
_ = convertArgToGno("", tt.argT)
}
assert.PanicsWithValue(t, tt.expectedErr, run)
})
}
}
Loading