Merge remote-tracking branch 'security/security-rc'

core/src/test/java/hudson/util/FormValidationTest.java

@@ -28,6 +28,9 @@ import static org.junit.Assert.*;
 import java.util.Arrays;
 
 import org.junit.Test;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author sogabe
@@ -105,4 +108,10 @@ public class FormValidationTest {
     private FormValidation aggregate(FormValidation... fvs) {
         return FormValidation.aggregate(Arrays.asList(fvs));
     }
+
+    @Test
+    public void formValidationException() {
+        FormValidation fv = FormValidation.error(new Exception("<html"), "Message<html");
+        assertThat(fv.renderHtml(), not(containsString("<html")));
+    }
 }