From fad82c1b6fd508db0f250691705e45caf8192043 Mon Sep 17 00:00:00 2001
From: AdamKorcz <adam@adalogics.com>
Date: Tue, 15 Feb 2022 15:32:31 +0000
Subject: [PATCH] server/etcdserver: fix oss-fuzz issue N

---
 server/etcdserver/apply_v2.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/etcdserver/apply_v2.go b/server/etcdserver/apply_v2.go
index 2f5913f18..6b292233e 100644
--- a/server/etcdserver/apply_v2.go
+++ b/server/etcdserver/apply_v2.go
@@ -20,6 +20,7 @@ import (
 	"path"
 	"strconv"
 	"time"
+	"unicode/utf8"
 
 	"github.com/coreos/go-semver/semver"
 	"go.etcd.io/etcd/pkg/v3/pbutil"
@@ -123,6 +124,9 @@ func (s *EtcdServer) applyV2Request(r *RequestV2, shouldApplyV3 membership.Shoul
 		alternative: func() string { return fmt.Sprintf("id:%d,method:%s,path:%s", r.ID, r.Method, r.Path) },
 	}
 	defer func(start time.Time) {
+		if !utf8.ValidString(r.Method) {
+			s.lg.Panic("method is not valid utf-8")
+		}
 		success := resp.Err == nil
 		applySec.WithLabelValues(v2Version, r.Method, strconv.FormatBool(success)).Observe(time.Since(start).Seconds())
 		warnOfExpensiveRequest(s.Logger(), s.Cfg.WarningApplyDuration, start, stringer, nil, nil)