Check before unmarshaling body

uber · Nov 14, 2019 · 2907f0f · 2907f0f
1 parent 6f8c029
commit 2907f0f
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/runtime/server_http_request.go b/runtime/server_http_request.go
@@ -748,16 +748,17 @@ func (req *ServerHTTPRequest) ReadAll() ([]byte, bool) {
 func (req *ServerHTTPRequest) UnmarshalBody(
 	body json.Unmarshaler, rawBody []byte,
 ) bool {
-	err := body.UnmarshalJSON(rawBody)
-	if err != nil {
-		req.logger.Warn("Could not parse json", zap.Error(err))
-		if !req.parseFailed {
-			req.res.SendError(400, "Could not parse json: "+err.Error(), err)
-			req.parseFailed = true
+	if len(rawBody) > 0 {
+		err := body.UnmarshalJSON(rawBody)
+		if err != nil {
+			req.logger.Warn("Could not parse json", zap.Error(err))
+			if !req.parseFailed {
+				req.res.SendError(400, "Could not parse json: "+err.Error(), err)
+				req.parseFailed = true
+			}
+			return false
 		}
-		return false
 	}
-
 	return true
 }