Merge branch 'master' into master

gqlerrors/error.go

@@ -2,6 +2,7 @@ package gqlerrors
 
 import (
 	"fmt"
+	"reflect"
 
 	"github.com/graphql-go/graphql/language/ast"
 	"github.com/graphql-go/graphql/language/location"
@@ -30,6 +31,9 @@ func NewError(message string, nodes []ast.Node, stack string, source *source.Sou
 	if source == nil {
 		for _, node := range nodes {
 			// get source from first node
+			if node == nil || reflect.ValueOf(node).IsNil() {
+				continue
+			}
 			if node.GetLoc() != nil {
 				source = node.GetLoc().Source
 			}
@@ -38,6 +42,9 @@ func NewError(message string, nodes []ast.Node, stack string, source *source.Sou
 	}
 	if len(positions) == 0 && len(nodes) > 0 {
 		for _, node := range nodes {
+			if node == nil || reflect.ValueOf(node).IsNil() {
+				continue
+			}
 			if node.GetLoc() == nil {
 				continue
 			}

graphql_test.go

@@ -171,3 +171,30 @@ func TestThreadsContextFromParamsThrough(t *testing.T) {
 	}
 
 }
+
+func TestNewErrorChecksNilNodes(t *testing.T) {
+	schema, err := graphql.NewSchema(graphql.SchemaConfig{
+		Query: graphql.NewObject(graphql.ObjectConfig{
+			Name: "Query",
+			Fields: graphql.Fields{
+				"graphql_is": &graphql.Field{
+					Type: graphql.String,
+					Resolve: func(p graphql.ResolveParams) (interface{}, error) {
+						return "", nil
+					},
+				},
+			},
+		}),
+	})
+	if err != nil {
+		t.Fatalf("unexpected errors: %v", err.Error())
+	}
+	query := `{graphql_is:great(sort:ByPopularity)}{stars}`
+	result := graphql.Do(graphql.Params{
+		Schema:        schema,
+		RequestString: query,
+	})
+	if len(result.Errors) == 0 {
+		t.Fatalf("expected errors, got: %v", result)
+	}
+}