Fix parse port range (#205)

and also the error message

Author: 3DRX

unmarshal.go

@@ -811,7 +811,7 @@ func unmarshalMediaDescription(lex *lexer) (stateFn, error) { //nolint:cyclop
 	parts := strings.Split(field, "/")
 	newMediaDesc.MediaName.Port.Value, err = parsePort(parts[0])
 	if err != nil {
-		return nil, fmt.Errorf("%w `%v`", errSDPInvalidPortValue, parts[0])
+		return nil, err
 	}
 
 	if len(parts) > 1 {
@@ -986,10 +986,10 @@ func timeShorthand(b byte) int64 {
 func parsePort(value string) (int, error) {
 	port, err := strconv.Atoi(value)
 	if err != nil {
-		return 0, fmt.Errorf("%w `%v`", errSDPInvalidPortValue, port)
+		return 0, fmt.Errorf("%w `%v`", errSDPInvalidPortValue, value)
 	}
 
-	if port < 0 || port > 65536 {
+	if port < 0 || port > 65535 {
 		return 0, fmt.Errorf("%w -- out of range `%v`", errSDPInvalidPortValue, port)
 	}
 

unmarshal_test.go

@@ -4,6 +4,7 @@
 package sdp
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -395,6 +396,42 @@ func TestUnmarshalZeroValues(t *testing.T) {
 	assert.Equal(t, in, string(out))
 }
 
+func TestUnmarshalPortRange(t *testing.T) {
+	for _, test := range []struct {
+		In          string
+		ExpectError error
+	}{
+		{
+			In:          SessionAttributesSDP + "m=video -1 RTP/AVP 99\r\n",
+			ExpectError: fmt.Errorf("%w -- out of range `%v`", errSDPInvalidPortValue, "-1"),
+		},
+		{
+			In:          SessionAttributesSDP + "m=video 65536 RTP/AVP 99\r\n",
+			ExpectError: fmt.Errorf("%w -- out of range `%v`", errSDPInvalidPortValue, "65536"),
+		},
+		{
+			In:          SessionAttributesSDP + "m=video 0 RTP/AVP 99\r\n",
+			ExpectError: nil,
+		},
+		{
+			In:          SessionAttributesSDP + "m=video 65535 RTP/AVP 99\r\n",
+			ExpectError: nil,
+		},
+		{
+			In:          SessionAttributesSDP + "m=video --- RTP/AVP 99\r\n",
+			ExpectError: fmt.Errorf("%w `%v`", errSDPInvalidPortValue, "---"),
+		},
+	} {
+		var sd SessionDescription
+		err := sd.UnmarshalString(test.In)
+		if err != nil && test.ExpectError != nil {
+			assert.Equal(t, test.ExpectError.Error(), err.Error())
+		} else {
+			assert.Equal(t, err, test.ExpectError)
+		}
+	}
+}
+
 func BenchmarkUnmarshal(b *testing.B) {
 	b.ReportAllocs()
 	for i := 0; i < b.N; i++ {