Changeset 11319

Timestamp:

04/20/07 19:02:43 (2 years ago)

Author:

mloskot

Message:

Improved fix for #755. The markup decl in DOCTYPE is not skipped but properly consumed to tokens now.

Files:

• trunk/gdal/port (modified) (1 prop)
• trunk/gdal/port/cpl_minixml.cpp (modified) (2 diffs)

trunk/gdal/port/cpl_minixml.cpp

@@ -203 +203 @@
-            }
-            
-
-
+
-             * - a left square bracket [
-             * - a list of declarations
@@ -210 +209 @@
-             * Example:
-             * <!DOCTYPE RootElement [ ...declarations... ]>
-             *
-             * We need to skip all 3 parts, until closing > 
-             */
-            if( chNext == '[' )
-            {
+                AddToToken( psContext, chNext );
+
-                do
-                {
-                    chNext = ReadChar( psContext );
+                    AddToToken( psContext, chNext );
-                }
-                while( chNext != ']'
-                    && !EQUALN(psContext->pszInput+psContext->nInputOffset,"]>", 2) );
-
-                // Skip "]" character to point to the closing ">"
-                chNext = ReadChar( psContext );
+                AddToToken( psContext, chNext );
+
+                // Skip ">" character, will be consumed below
-                chNext = ReadChar( psContext );
-            }