From 1528764194aced9df27bc34847de70e0fcd0c268 Mon Sep 17 00:00:00 2001
From: Ivan Sopov <sopov.ivan@gmail.com>
Date: Fri, 10 Jun 2016 11:48:06 -0700
Subject: [PATCH] Fix potential offset errors in BasicJsonParser

Update BasicJsonParser to fix potential exceptions if strings happen
to be empty.

Fixes gh-6136
---
 .../java/org/springframework/boot/json/BasicJsonParser.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
index ec43e0cb454..9b0b40a3579 100644
--- a/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
+++ b/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
@@ -93,14 +93,14 @@ public class BasicJsonParser implements JsonParser {
 	}
 
 	private static String trimTrailingCharacter(String string, char c) {
-		if (string.length() >= 0 && string.charAt(string.length() - 1) == c) {
+		if (string.length() > 0 && string.charAt(string.length() - 1) == c) {
 			return string.substring(0, string.length() - 1);
 		}
 		return string;
 	}
 
 	private static String trimLeadingCharacter(String string, char c) {
-		if (string.length() >= 0 && string.charAt(0) == c) {
+		if (string.length() > 0 && string.charAt(0) == c) {
 			return string.substring(1);
 		}
 		return string;