Merge 135174 - Fix XPointer bug.

third_party/libxml/src/xpointer.c

 /*
  * xpointer.c : Code to handle XML Pointer
  *
  * Base implementation was made accordingly to
  * W3C Candidate Recommendation 7 June 2000
  * http://www.w3.org/TR/2000/CR-xptr-20000607
  *
  * Added support for the element() scheme described in:
  * W3C Proposed Recommendation 13 November 2002
  * http://www.w3.org/TR/2002/PR-xptr-element-20021113/  
@@ skipping 989 matching lines @@
     }
 
     cur = buffer;
     while (CUR != 0) {
         if (CUR == ')') {
             level--;
             if (level == 0) {
                 NEXT;
                 break;
             }
-            *cur++ = CUR;
         } else if (CUR == '(') {
             level++;
-            *cur++ = CUR;
         } else if (CUR == '^') {
-            NEXT;
-            if ((CUR == ')') || (CUR == '(') || (CUR == '^')) {
-                *cur++ = CUR;
-            } else {
-                *cur++ = '^';
-                *cur++ = CUR;
+            if ((NXT(1) == ')') || (NXT(1) == '(') || (NXT(1) == '^')) {
+                NEXT;
             }
-        } else {
-            *cur++ = CUR;
         }
+        *cur++ = CUR;
         NEXT;
     }
     *cur = 0;
 
     if ((level != 0) && (CUR == 0)) {
         xmlFree(buffer);
         XP_ERROR(XPTR_SYNTAX_ERROR);
     }
 
     if (xmlStrEqual(name, (xmlChar *) "xpointer")) {
@@ skipping 1967 matching lines @@
     }
 
     NEXT;
     SKIP_BLANKS;
 }
 
 #define bottom_xpointer
 #include "elfgcchack.h"
 #endif