luehe 2004/05/07 10:09:53
Modified: jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
Log:
Fix for Bugtraq 5043467 ("small-icon and large-icon values are not retrieved")
Patch provided by: [EMAIL PROTECTED]
Revision Changes Path
1.54 +9 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- TagLibraryInfoImpl.java 17 Mar 2004 19:23:03 -0000 1.53
+++ TagLibraryInfoImpl.java 7 May 2004 17:09:53 -0000 1.54
@@ -383,6 +383,15 @@
smallIcon = element.getBody();
} else if ("large-icon".equals(tname)) {
largeIcon = element.getBody();
+ } else if ("icon".equals(tname)) {
+ TreeNode icon = element.findChild("small-icon");
+ if (icon != null) {
+ smallIcon = icon.getBody();
+ }
+ icon = element.findChild("large-icon");
+ if (icon != null) {
+ largeIcon = icon.getBody();
+ }
} else if ("info".equals(tname) ||
"description".equals(tname)) {
info = element.getBody();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
