roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1511305 - /roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
Date Wed, 07 Aug 2013 13:36:14 GMT
Author: snoopdave
Date: Wed Aug  7 13:36:14 2013
New Revision: 1511305

URL: http://svn.apache.org/r1511305
Log:
Don't attempt to sanitize null values

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java?rev=1511305&r1=1511304&r2=1511305&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java Wed
Aug  7 13:36:14 2013
@@ -86,7 +86,7 @@ public class HTMLSanitizer {
 
 	public static String conditionallySanitize(String ret) {
 		// if XSS is enabled then sanitize HTML
-		if (xssEnabled) {
+		if (xssEnabled && ret != null) {
 			ret = HTMLSanitizer.sanitize(ret);
 		}
 		return ret;



Mime
View raw message