From 0f50a9a60a3e3d99056dbc32aec5640063eea7f5 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Sun, 22 Mar 2020 13:28:49 +0900
Subject: [PATCH] Fix empty domain handling in ResponseCookie

This commit also updates its test to use its intended inputs.
---
 .../src/main/java/org/springframework/http/ResponseCookie.java  | 2 +-
 .../test/java/org/springframework/http/ResponseCookieTests.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/ResponseCookie.java b/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
index 3b8461bf3c..0e1e81d93e 100644
--- a/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
+++ b/spring-web/src/main/java/org/springframework/http/ResponseCookie.java
@@ -248,7 +248,7 @@ public final class ResponseCookie extends HttpCookie {
 				if (lenient && !StringUtils.isEmpty(domain)) {
 					String s = domain.trim();
 					if (s.startsWith("\"") && s.endsWith("\"")) {
-						if (s.substring(1, domain.length() - 1).trim().isEmpty()) {
+						if (s.substring(1, s.length() - 1).trim().isEmpty()) {
 							return null;
 						}
 					}
diff --git a/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java b/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java
index d40657766c..fa9f387f88 100644
--- a/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java
+++ b/spring-web/src/test/java/org/springframework/http/ResponseCookieTests.java
@@ -86,7 +86,7 @@ public class ResponseCookieTests {
 
 		Arrays.asList("\"\"", "\t\"\" ", " \" \t \"\t")
 				.forEach(domain -> {
-					ResponseCookie cookie = ResponseCookie.fromClientResponse("id", "1fWa").domain("\"\"").build();
+					ResponseCookie cookie = ResponseCookie.fromClientResponse("id", "1fWa").domain(domain).build();
 					assertThat(cookie.getDomain()).isNull();
 				});