You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2006/04/23 12:49:45 UTC

svn commit: r396251 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/apps/FOURIResolver.java status.xml

Author: jeremias
Date: Sun Apr 23 03:49:42 2006
New Revision: 396251

URL: http://svn.apache.org/viewcvs?rev=396251&view=rev
Log:
Bugzilla #39285:
Bugfix: Fixed OutOfMemoryException with long data URLs (RFC 2397).

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
    xmlgraphics/fop/trunk/status.xml

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java?rev=396251&r1=396250&r2=396251&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java Sun Apr 23 03:49:42 2006
@@ -72,6 +72,11 @@
     public Source resolve(String href, String base)
         throws javax.xml.transform.TransformerException {
         
+        //data URLs can be quite long so don't try to build a File (can lead to problems)
+        if (href.startsWith("data:")) {
+            return parseDataURI(href);
+        }
+        
         URL absoluteURL = null;
         File f = new File(href);
         if (f.exists()) {
@@ -80,8 +85,6 @@
             } catch (MalformedURLException mfue) {
                 log.error("Could not convert filename to URL: " + mfue.getMessage(), mfue); 
             }
-        } else if (href.startsWith("data:")) {
-            return parseDataURI(href);
         } else {
             URL baseURL = toBaseURL(base);
             if (baseURL == null) {

Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/status.xml?rev=396251&r1=396250&r2=396251&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Sun Apr 23 03:49:42 2006
@@ -27,6 +27,9 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JM" type="fix" fixes-bug="39285">
+        Bugfix: Fixed OutOfMemoryException with long data URLs (RFC 2397).
+      </action>
       <action context="Code" dev="JM" type="add" fixes-bug="39118" due-to="Pierre-Henri Kraus">
         Initial support for page-number-citation-last (XSL 1.1). Works without problems 
         only for page-sequence so far.



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org