From 165254202d2625e7eebf3f649e4068124656a5e6 Mon Sep 17 00:00:00 2001
From: Jason Pyeron <jpyeron@pdinc.us>
Date: Thu, 06 Sep 2012 17:35:20 -0400
Subject: [PATCH] Merged CVE-2007-450 warning logging from Jason Pyeron (issue 126)

---
 src/com/gitblit/utils/StringUtils.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/gitblit/utils/StringUtils.java b/src/com/gitblit/utils/StringUtils.java
index 3972f20..08fd497 100644
--- a/src/com/gitblit/utils/StringUtils.java
+++ b/src/com/gitblit/utils/StringUtils.java
@@ -78,7 +78,7 @@
 	 * @return plain text escaped for html
 	 */
 	public static String escapeForHtml(String inStr, boolean changeSpace) {
-		StringBuffer retStr = new StringBuffer();
+		StringBuilder retStr = new StringBuilder();
 		int i = 0;
 		while (i < inStr.length()) {
 			if (inStr.charAt(i) == '&') {
@@ -119,7 +119,7 @@
 	 * @return properly escaped url
 	 */
 	public static String encodeURL(String inStr) {
-		StringBuffer retStr = new StringBuffer();
+		StringBuilder retStr = new StringBuilder();
 		int i = 0;
 		while (i < inStr.length()) {
 			if (inStr.charAt(i) == '/') {
@@ -594,7 +594,6 @@
 				// ignore unsupported charsets
 			}
 		}
-		value = new String(content, Charset.forName("UTF-8"));
 		if (value.startsWith("\uFEFF")) {
 			// strip UTF-8 BOM
             return value.substring(1);

--
Gitblit v1.9.1