return error in case there is not enough data available

mholt · Aug 12, 2024 · 66db9b9 · 66db9b9
1 parent 8a25df6
commit 66db9b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/modules/l4ssh/matcher.go b/modules/l4ssh/matcher.go
@@ -42,9 +42,9 @@ func (*MatchSSH) CaddyModule() caddy.ModuleInfo {
 // Match returns true if the connection looks like SSH.
 func (m *MatchSSH) Match(cx *layer4.Connection) (bool, error) {
 	p := make([]byte, len(sshPrefix))
-	n, err := io.ReadFull(cx, p)
-	if err != nil || n < len(sshPrefix) {
-		return false, nil
+	_, err := io.ReadFull(cx, p)
+	if err != nil {
+		return false, err
 	}
 	return bytes.Equal(p, sshPrefix), nil
 }

diff --git a/modules/l4xmpp/matcher.go b/modules/l4xmpp/matcher.go
@@ -42,9 +42,9 @@ func (*MatchXMPP) CaddyModule() caddy.ModuleInfo {
 // Match returns true if the connection looks like XMPP.
 func (m *MatchXMPP) Match(cx *layer4.Connection) (bool, error) {
 	p := make([]byte, minXmppLength)
-	n, err := io.ReadFull(cx, p)
-	if err != nil || n < minXmppLength { // needs at least 50 (fix for adium/pidgin)
-		return false, nil
+	_, err := io.ReadFull(cx, p)
+	if err != nil { // needs at least 50 (fix for adium/pidgin)
+		return false, err
 	}
 	return strings.Contains(string(p), xmppWord), nil
 }