cvs commit: xml-xerces/c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner.cpp

[amassari]

amassari    2003/11/21 06:46:56

  Modified:    c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner.cpp
  Log:
  Protect getEntityDeclPool from invoking a method on a NULL pointer (bug#24881)
  
  Revision  Changes    Path
  1.30      +5 -1      xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp
  
  Index: DGXMLScanner.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- DGXMLScanner.cpp  12 Nov 2003 20:29:47 -0000      1.29
  +++ DGXMLScanner.cpp  21 Nov 2003 14:46:56 -0000      1.30
  @@ -170,11 +170,15 @@
   // ---------------------------------------------------------------------------
   NameIdPool<DTDEntityDecl>* DGXMLScanner::getEntityDeclPool()
   {
  +    if(!fGrammar)
  +        return 0;
       return ((DTDGrammar*)fGrammar)->getEntityDeclPool();
   }
   
   const NameIdPool<DTDEntityDecl>* DGXMLScanner::getEntityDeclPool() const
   {
  +    if(!fGrammar)
  +        return 0;
       return ((DTDGrammar*)fGrammar)->getEntityDeclPool();
   }
   
  
  
  
  1.31      +5 -1      xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
  
  Index: IGXMLScanner.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- IGXMLScanner.cpp  12 Nov 2003 20:29:47 -0000      1.30
  +++ IGXMLScanner.cpp  21 Nov 2003 14:46:56 -0000      1.31
  @@ -180,11 +180,15 @@
   // ---------------------------------------------------------------------------
   NameIdPool<DTDEntityDecl>* IGXMLScanner::getEntityDeclPool()
   {
  +    if(!fDTDGrammar)
  +        return 0;
       return fDTDGrammar->getEntityDeclPool();
   }
   
   const NameIdPool<DTDEntityDecl>* IGXMLScanner::getEntityDeclPool() const
   {
  +    if(!fDTDGrammar)
  +        return 0;
       return fDTDGrammar->getEntityDeclPool();
   }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]