fixes some npe's if characters outsite root

and if namespace not specified/correct

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194426 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/FOTreeBuilder.java b/src/org/apache/fop/fo/FOTreeBuilder.java
index 94e431f5292f1c4622aad6a94484631c71103e64..0ebaecc01e90436a87640948851c0090c7aad258 100644 (file)
--- a/src/org/apache/fop/fo/FOTreeBuilder.java
+++ b/src/org/apache/fop/fo/FOTreeBuilder.java
@@ -137,7 +137,9 @@ public class FOTreeBuilder extends DefaultHandler implements TreeBuilder {
      * SAX Handler for characters
      */
     public void characters(char data[], int start, int length) {
-        currentFObj.addCharacters(data, start, start + length);
+        if(currentFObj != null) {
+            currentFObj.addCharacters(data, start, start + length);
+        }
     }
 
     /**
@@ -207,6 +209,9 @@ public class FOTreeBuilder extends DefaultHandler implements TreeBuilder {
                                                 (currentFObj == null) ? null
                                                 : currentFObj.properties, currentFObj);
             } else {
+                if(currentFObj == null) {
+                    throw new FOPException("Invalid XML or missing namespace");
+                }
                 list = currentFObj.properties;
             }
             fobj = fobjMaker.make(currentFObj, list);