diff --git a/src/xercesc/internal/ReaderMgr.hpp b/src/xercesc/internal/ReaderMgr.hpp
index 0e0097e5f49c95243989b5d54e40dfecac520b7a..9b66c6baa89d3503dc871eaf2c5fab4b429c5ba1 100644
--- a/src/xercesc/internal/ReaderMgr.hpp
+++ b/src/xercesc/internal/ReaderMgr.hpp
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.16  2005/03/09 16:07:11  amassari
+ * Protected getSrcOffset to avoid crashing when parsing has finished; updated documentation
+ *
  * Revision 1.15  2005/02/08 09:21:11  amassari
  * Removed warnings
  *
@@ -412,7 +415,7 @@ inline bool ReaderMgr::getThrowEOE() const
 
 inline unsigned int ReaderMgr::getSrcOffset() const
 {
-    return fCurReader->getSrcOffset();
+    return fCurReader? fCurReader->getSrcOffset() : 0;
 }
 
 inline bool ReaderMgr::lookingAtChar(const XMLCh chToCheck)
diff --git a/src/xercesc/parsers/DOMBuilderImpl.hpp b/src/xercesc/parsers/DOMBuilderImpl.hpp
index 092525180cb3d835803c0147ca7a8fb302563fae..bb80c9d6485d878097449389ce2a3d3ffecb0482 100644
--- a/src/xercesc/parsers/DOMBuilderImpl.hpp
+++ b/src/xercesc/parsers/DOMBuilderImpl.hpp
@@ -652,6 +652,7 @@ public :
 
     /**
       * Returns the current src offset within the input source.
+      * To be used only while parsing is in progress.
       *
       * @return offset within the input source
       */
diff --git a/src/xercesc/parsers/SAX2XMLFilterImpl.hpp b/src/xercesc/parsers/SAX2XMLFilterImpl.hpp
index e13b91ce44c184929b712ba14713c38f8a32b0b8..12805755427ac9300afc8a892a8d6f20536af172 100644
--- a/src/xercesc/parsers/SAX2XMLFilterImpl.hpp
+++ b/src/xercesc/parsers/SAX2XMLFilterImpl.hpp
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.3  2005/03/09 16:07:09  amassari
+ * Protected getSrcOffset to avoid crashing when parsing has finished; updated documentation
+ *
  * Revision 1.2  2005/01/06 21:39:44  amassari
  * Removed warnings
  *
@@ -473,6 +476,7 @@ public :
 
     /**
       * Returns the current src offset within the input source.
+      * To be used only while parsing is in progress.
       *
       * @return offset within the input source
       */
diff --git a/src/xercesc/parsers/SAX2XMLReaderImpl.hpp b/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
index 71985b6ac1d538987f1e1ab22100f38b1002f4e9..36a2fbaa0991bb66846165224a6d40b1c9a993c0 100644
--- a/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
+++ b/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.31  2005/03/09 16:07:10  amassari
+ * Protected getSrcOffset to avoid crashing when parsing has finished; updated documentation
+ *
  * Revision 1.30  2005/02/25 11:31:07  amassari
  * Performance improvements by David Bertoni (jira# 1343)
  *
@@ -729,6 +732,7 @@ public :
 
     /**
       * Returns the current src offset within the input source.
+      * To be used only while parsing is in progress.
       *
       * @return offset within the input source
       */
diff --git a/src/xercesc/parsers/SAXParser.hpp b/src/xercesc/parsers/SAXParser.hpp
index c194dc776a261c376dc411f7784ca0bee4c226fc..5073fef4514c4807b6d9f952c7c38081cc6e5286 100644
--- a/src/xercesc/parsers/SAXParser.hpp
+++ b/src/xercesc/parsers/SAXParser.hpp
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.38  2005/03/09 16:07:10  amassari
+ * Protected getSrcOffset to avoid crashing when parsing has finished; updated documentation
+ *
  * Revision 1.37  2004/12/07 19:45:43  knoaman
  * An option to ignore a cached DTD grammar when a document contains an
  * internal and external subset.
@@ -657,6 +660,7 @@ public :
 
     /**
      * Returns the current src offset within the input source.
+     * To be used only while parsing is in progress.
      *
      * @return offset within the input source
      */
diff --git a/src/xercesc/parsers/XercesDOMParser.hpp b/src/xercesc/parsers/XercesDOMParser.hpp
index 88bbe23109ca13ef06949af93814e686608bb855..a1ff5a639feda72f7459495f9d88f43d2f6b37a8 100644
--- a/src/xercesc/parsers/XercesDOMParser.hpp
+++ b/src/xercesc/parsers/XercesDOMParser.hpp
@@ -195,6 +195,7 @@ public :
 
     /**
      * Returns the current src offset within the input source.
+     * To be used only while parsing is in progress.
      *
      * @return offset within the input source
      */
diff --git a/src/xercesc/sax2/SAX2XMLReader.hpp b/src/xercesc/sax2/SAX2XMLReader.hpp
index cc53c17c24f51062e6d1b7ac9480e623cb201aef..0f532e2a589020927fd73adfe1e2dd8826d8f608 100644
--- a/src/xercesc/sax2/SAX2XMLReader.hpp
+++ b/src/xercesc/sax2/SAX2XMLReader.hpp
@@ -16,6 +16,9 @@
 
 /*
  * $Log$
+ * Revision 1.15  2005/03/09 16:07:11  amassari
+ * Protected getSrcOffset to avoid crashing when parsing has finished; updated documentation
+ *
  * Revision 1.14  2005/01/06 21:39:44  amassari
  * Removed warnings
  *
@@ -601,6 +604,7 @@ public:
 
     /**
       * Returns the current src offset within the input source.
+      * To be used only while parsing is in progress.
       *
       * @return offset within the input source
       */