From efe631d9ec18e9b34639b436989d3521a268779f Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 10 Sep 2018 12:58:33 -0700 Subject: [PATCH] lang/funcs: in "sort", don't panic if given a null string It is incorrect to use a null string, but that should be reported as an error rather than a panic. --- lang/funcs/string.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lang/funcs/string.go b/lang/funcs/string.go index 54261cd09..cb3d03cbd 100644 --- a/lang/funcs/string.go +++ b/lang/funcs/string.go @@ -72,7 +72,10 @@ var SortFunc = function.New(&function.Spec{ list := make([]string, 0, listVal.LengthInt()) for it := listVal.ElementIterator(); it.Next(); { - _, v := it.Element() + iv, v := it.Element() + if v.IsNull() { + return cty.UnknownVal(retType), fmt.Errorf("given list element %s is null; a null string cannot be sorted", iv.AsBigFloat().String()) + } list = append(list, v.AsString()) }