aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2007-02-08 17:46:57 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2007-02-08 17:46:57 +0000
commitf086d2f3ada97461223ce8f2142facb276b82387 (patch)
treed6c5649dbe2202252af928cfc0c01fa609d73bff
parentadf3c2b7cafde18623125d0a7d205dc562cec14a (diff)
downloadxmlgraphics-fop-f086d2f3ada97461223ce8f2142facb276b82387.tar.gz
xmlgraphics-fop-f086d2f3ada97461223ce8f2142facb276b82387.zip
Bugzilla 41572:
URIs were not properly parsed if they contain bracketed part(s) Fix suggested by Erwin Tratar. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@504980 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/datatypes/URISpecification.java2
-rw-r--r--status.xml3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/datatypes/URISpecification.java b/src/java/org/apache/fop/datatypes/URISpecification.java
index c6f8c078c..2a3a3cba9 100644
--- a/src/java/org/apache/fop/datatypes/URISpecification.java
+++ b/src/java/org/apache/fop/datatypes/URISpecification.java
@@ -40,7 +40,7 @@ public class URISpecification {
*/
href = href.trim();
if (href.startsWith("url(") && (href.indexOf(")") != -1)) {
- href = href.substring(4, href.indexOf(")")).trim();
+ href = href.substring(4, href.lastIndexOf(")")).trim();
if (href.startsWith("'") && href.endsWith("'")) {
href = href.substring(1, href.length() - 1);
} else if (href.startsWith("\"") && href.endsWith("\"")) {
diff --git a/status.xml b/status.xml
index de8c1f99e..4a4ffabae 100644
--- a/status.xml
+++ b/status.xml
@@ -28,6 +28,9 @@
<changes>
<release version="FOP Trunk">
+ <action context="Code" dev="AD" type="fix" fixes-bug="41572" due-to="Erwin Tratar">
+ Fix parsing 'url(...)' when the URL itself contains a bracketed part.
+ </action>
<action context="Code" dev="JM" type="add">
Support for GIF images in RTF output (RTF handler, only. Does not affect the RTF library.)
</action>