[patch] Patch for PageContextImpl.java

PageContextImpl.diff (text/plain), 2.27 KB, created by Sheldon Shao on 2012-09-13 13:33:48 UTC

(hide)

Description: Patch for PageContextImpl.java

Filename:

MIME Type:

Creator: Sheldon Shao

Created: 2012-09-13 13:33:48 UTC

Size: 2.27 KB

patch

obsolete

>Index: apache/jasper/runtime/PageContextImpl.java >=================================================================== >--- apache/jasper/runtime/PageContextImpl.java (revision 1384312) >+++ apache/jasper/runtime/PageContextImpl.java (working copy) >@@ -913,28 +913,69 @@ > } > } > >- private static String XmlEscape(String s) { >- if (s == null) >- return null; >- StringBuilder sb = new StringBuilder(); >- for (int i = 0; i < s.length(); i++) { >+ protected static String XmlEscape(String s) { >+ if (s == null) { >+ return ""; >+ } >+ int len = s.length(); >+ >+ /* >+ * Look for any "bad" characters, Escape "bad" character was found >+ */ >+ // ASCII " 34 & 38 ' 39 < 60 > 62 >+ for (int i = 0; i < len; i++) { > char c = s.charAt(i); >+ if (c >= '\"' >+ && c <= '>' >+ && (c == '<' || c == '>' || c == '\'' || c == '&' || c == '"')) { >+ // need to escape them and then quote the whole string >+ StringBuilder sb = new StringBuilder((int) (len * 1.2)); >+ sb.append(s, 0, i); >+ int pos = i + 1; >+ for (int j = i; j < len; j++) { >+ c = s.charAt(j); >+ if (c >= '\"' && c <= '>') { > if (c == '<') { >+ if (j > pos) { >+ sb.append(s, pos, j); >+ } > sb.append("&lt;"); >+ pos = j + 1; > } else if (c == '>') { >+ if (j > pos) { >+ sb.append(s, pos, j); >+ } > sb.append("&gt;"); >+ pos = j + 1; > } else if (c == '\'') { >+ if (j > pos) { >+ sb.append(s, pos, j); >+ } > sb.append("&#039;"); // &apos; >+ pos = j + 1; > } else if (c == '&') { >+ if (j > pos) { >+ sb.append(s, pos, j); >+ } > sb.append("&amp;"); >+ pos = j + 1; > } else if (c == '"') { >+ if (j > pos) { >+ sb.append(s, pos, j); >+ } > sb.append("&#034;"); // &quot; >- } else { >- sb.append(c); >+ pos = j + 1; > } > } >+ } >+ if (pos < len) { >+ sb.append(s, pos, len); >+ } > return sb.toString(); > } >+ } >+ return s; >+ } > > /** > * Proprietary method to evaluate EL expressions. XXX - This method should View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]