Changeset 11276

Timestamp:

04/17/07 19:32:30 (2 years ago)

Author:

mloskot

Message:

Fixed handling complex DTD with markup declarations in DOCTYPE element (Ticket #755). The fix just ignores the declaration list block.

Files:

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

trunk/gdal/port/cpl_minixml.cpp

@@ -202 +202 @@
-                break;
-            }
+            
+            /* Skip the internal DTD subset as NOT SUPPORTED YET (Ticket #755).
+             * The markup declaration block within a DOCTYPE tag consists of:
+             * - a left square bracket [
+             * - a list of declarations
+             * - a right square bracket ]
+             * Example:
+             * <!DOCTYPE RootElement [ ...declarations... ]>
+             *
+             * We need to skip all 3 parts, until closing > 
+             */
+            if( chNext == '[' )
+            {
+                do
+                {
+                    chNext = ReadChar( psContext );
+                }
+                while( chNext != ']'
+                    && !EQUALN(psContext->pszInput+psContext->nInputOffset,"]>", 2) );
+
+                // Skip "]" character to point to the closing ">"
+                chNext = ReadChar( psContext );
+                chNext = ReadChar( psContext );
+            }
+
-
-            if( chNext == '\"' )
@@ -1730 +1755 @@
- * @param psTree the document tree to write. 
- * @param pszFilename the name of the file to write to. 
+ * @return TRUE on success, FALSE otherwise.
- */
-