From b0456709f41acee07522c41a3b245d5fc70719df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tighearn=C3=A1n=20Carroll?= <tighearnan.carroll@gmail.com>
Date: Mon, 13 May 2024 18:00:14 +0100
Subject: [PATCH] found, fixed, and tested a nil panic

---
 encoder.go      |  5 ++++-
 encoder_test.go | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/encoder.go b/encoder.go
index ae3eb81..2ab8468 100644
--- a/encoder.go
+++ b/encoder.go
@@ -274,7 +274,10 @@ func (e *encoder) marshal(namespace []byte, v reflect.Value, idx int) (bool, err
 	if t.Kind() == reflect.Ptr && v.IsNil() {
 		return false, nil
 	}
-	um := v.Interface().(Marshaler)
+	um, ok := v.Interface().(Marshaler)
+	if !ok {
+		return false, nil
+	}
 	vals, err := um.MarshalForm()
 	if err != nil {
 		return false, err
diff --git a/encoder_test.go b/encoder_test.go
index fd32882..c4c88f9 100644
--- a/encoder_test.go
+++ b/encoder_test.go
@@ -1718,3 +1718,50 @@ func Test_MarshalForm_Err(t *testing.T) {
 	Equal(t, err.Error(), "Field Namespace:Struct ERROR:always err")
 	Equal(t, v3, url.Values{})
 }
+
+type errmarshalerptrrec struct {
+	called bool
+	Fname  string
+	Sname  string
+}
+
+func (m *errmarshalerptrrec) MarshalForm() ([]string, error) {
+	m.called = true
+	return nil, errors.New("always err")
+}
+
+func Test_MarshalForm_ErrPtrRec(t *testing.T) {
+	encoder := NewEncoder()
+
+	t1 := struct {
+		Ptr *errmarshalerptrrec
+	}{
+		Ptr: &errmarshalerptrrec{
+			Fname: "John",
+			Sname: "Smith",
+		},
+	}
+	v1, err := encoder.Encode(t1)
+	NotEqual(t, err, nil)
+	Equal(t, err.Error(), "Field Namespace:Ptr ERROR:always err")
+	Equal(t, v1, url.Values{})
+
+	t2 := struct {
+		NilPtr *errmarshalerptrrec
+	}{}
+	v2, err := encoder.Encode(t2)
+	Equal(t, err, nil)
+	Equal(t, v2, url.Values{})
+
+	t3 := struct {
+		Struct errmarshalerptrrec
+	}{
+		Struct: errmarshalerptrrec{
+			Fname: "John",
+			Sname: "Smith",
+		},
+	}
+	_, err = encoder.Encode(t3)
+	Equal(t, err, nil)
+	Equal(t, t3.Struct.called, false)
+}