cvs commit: xml-xalan/c/src/XPath XPathProcessorImpl.cpp

[dbertoni]

dbertoni    2002/09/24 21:39:16

  Modified:    c/src/XPath XPathProcessorImpl.cpp
  Log:
  Guard against | | in match pattern.  Fixes bug 12984.
  
  Revision  Changes    Path
  1.61      +9 -2      xml-xalan/c/src/XPath/XPathProcessorImpl.cpp
  
  Index: XPathProcessorImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathProcessorImpl.cpp,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- XPathProcessorImpl.cpp    19 Sep 2002 05:59:36 -0000      1.60
  +++ XPathProcessorImpl.cpp    25 Sep 2002 04:39:16 -0000      1.61
  @@ -2306,9 +2306,16 @@
                nextToken();
        }
   
  -     if(!tokenIs(XalanUnicode::charVerticalLine) == true && length(m_token) 
!= 0)
  +     if(length(m_token) != 0)
        {
  -             RelativePathPattern();
  +             if (!tokenIs(XalanUnicode::charVerticalLine) == true)
  +             {
  +                     RelativePathPattern();
  +             }
  +             else if (lookahead(XalanUnicode::charVerticalLine, -1) == true)
  +             {
  +                     error("Unexpected token '|' found in match pattern");
  +             }
        }
   
        // Terminate for safety.
  
  
  

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