Merge pull request #627 from kuba--/fix-616/uast_extract

ajnavarro · web-flow · commit ffddc26d05cd · 2018-11-23T10:18:44.000+01:00
Fix uast_extract panic.
diff --git a/internal/function/uast.go b/internal/function/uast.go
@@ -575,7 +575,7 @@ func posToString(pos uast.Positions) string {
 
 func extractAnyProp(node nodes.Object, key string) []interface{} {
 	v, ok := node[key]
-	if !ok {
+	if !ok || v == nil {
 		return nil
 	}
 
diff --git a/internal/function/uast_test.go b/internal/function/uast_test.go
@@ -322,6 +322,14 @@ func TestUASTChildren(t *testing.T) {
 	}
 }
 
+func TestExtractAnyProp(t *testing.T) {
+	node, key := make(nodes.Object), "foo"
+	node[key] = nil
+
+	props := extractAnyProp(node, key)
+	require.Nil(t, props)
+}
+
 func assertUASTBlobs(t *testing.T, ctx *sql.Context, a, b interface{}) {
 	t.Helper()
 	var require = require.New(t)

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ func posToString(pos uast.Positions) string {`
`575`	`575`
`576`	`576`	`func extractAnyProp(node nodes.Object, key string) []interface{} {`
`577`	`577`	`v, ok := node[key]`
`578`		`- if !ok {`
	`578`	`+ if !ok \|\| v == nil {`
`579`	`579`	`return nil`
`580`	`580`	`}`
`581`	`581`
Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,14 @@ func TestUASTChildren(t *testing.T) {`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`
	`325`	`+func TestExtractAnyProp(t *testing.T) {`
	`326`	`+ node, key := make(nodes.Object), "foo"`
	`327`	`+ node[key] = nil`
	`328`	`+`
	`329`	`+ props := extractAnyProp(node, key)`
	`330`	`+ require.Nil(t, props)`
	`331`	`+}`
	`332`	`+`
`325`	`333`	`func assertUASTBlobs(t testing.T, ctx sql.Context, a, b interface{}) {`
`326`	`334`	`t.Helper()`
`327`	`335`	`var require = require.New(t)`