Skip to content

fix crash on x % 0` #1799

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

Merged
merged 1 commit into from
Jul 24, 2015
Merged

fix crash on x % 0` #1799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion sql/parser/eval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package parser

import (
"bytes"
"errors"
"fmt"
"math"
"reflect"
Expand Down Expand Up @@ -231,7 +232,11 @@ var binOps = map[binArgs]func(Datum, Datum) (Datum, error){
},

binArgs{Mod, intType, intType}: func(left Datum, right Datum) (Datum, error) {
return left.(DInt) % right.(DInt), nil
r := right.(DInt)
if r == 0 {
return nil, errors.New("zero modulus")
}
return left.(DInt) % r, nil
},
binArgs{Mod, floatType, floatType}: func(left Datum, right Datum) (Datum, error) {
return DFloat(math.Mod(float64(left.(DFloat)), float64(right.(DFloat)))), nil
Expand Down
4 changes: 4 additions & 0 deletions sql/parser/eval_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ func TestEvalExpr(t *testing.T) {
{`5 % 3`, `2`, nil},
// Division is always done on floats.
{`4 / 5`, `0.8`, nil},
{`1 / 0`, `+Inf`, nil},
{`-1.0 * (1.0 / 0.0)`, `-Inf`, nil},
// Grouping
{`1 + 2 + (3 * 4)`, `15`, nil},
// Unary operators.
Expand Down Expand Up @@ -204,9 +206,11 @@ func TestEvalExprError(t *testing.T) {
expr string
expected string
}{
{`1 % 0`, `zero modulus`},
{`'1' + '2'`, `unsupported binary operator:`},
{`'a' + 0`, `unsupported binary operator:`},
{`1.1 # 3.1`, `unsupported binary operator:`},
{`1/0.0`, `unsupported binary operator:`},
{`~0.1`, `unsupported unary operator:`},
{`'10' > 2`, `unsupported comparison operator:`},
{`1 IN ('a', 'b')`, `unsupported comparison operator:`},
Expand Down