Changeset 11168

Timestamp:

04/02/07 13:09:19 (1 year ago)

Author:

dmorissette

Message:

Backport for for MITAB bug 1657 - problem writing collections (GDAL #1541)

Files:

• branches/1.4/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp (modified) (4 diffs)
• branches/1.4/gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h (modified) (2 diffs)
• branches/1.4/gdal/ogr/ogrsf_frmts/mitab/mitab_rawbinblock.cpp (modified) (3 diffs)

branches/1.4/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp

@@ -34 +34 @@
- * Added missing NULL pointer checks in SetPenFromStyleString(),
- * SetBrushFromStyleString() and SetSymbolFromStyleString() (bug 1670)
+ *
+ * Revision 1.68  2007/02/22 18:35:53  dmorissette
+ * Fixed problem writing collections where MITAB was sometimes trying to
+ * read past EOF in write mode (bug 1657).
- *
- * Revision 1.66  2006/10/17 14:34:31  dmorissette
@@ -6753 +6757 @@
-
-        // And finally move the pointer back to the end of this component
-
+, TRUE
-        {
-            delete poRegionHdr;
@@ -6837 +6841 @@
-
-        // And finally move the pointer back to the end of this component
-
+, TRUE
-        {
-            delete poPlineHdr;
@@ -6920 +6924 @@
-
-        // And finally move the pointer back to the end of this component
-
+, TRUE
-        {
-            delete poMpointHdr;

branches/1.4/gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h

@@ -31 +31 @@
- *
- * $Log: mitab_priv.h,v $
+ * Revision 1.44  2007/02/22 18:35:53  dmorissette
+ * Fixed problem writing collections where MITAB was sometimes trying to
+ * read past EOF in write mode (bug 1657).
+ *
- * Revision 1.40  2005/10/06 19:15:31  dmorissette
- * Collections: added support for reading/writing pen/brush/symbol ids and
@@ -758 +762 @@
-    int         GotoByteRel(int nOffset);
-    int         GotoByteInBlock(int nOffset);
-
+
+
+
-    void        SetFirstBlockPtr(int nOffset);
-

branches/1.4/gdal/ogr/ogrsf_frmts/mitab/mitab_rawbinblock.cpp

@@ -32 +32 @@
- *
- * $Log: mitab_rawbinblock.cpp,v $
+ * Revision 1.10  2007/02/22 18:35:53  dmorissette
+ * Fixed problem writing collections where MITAB was sometimes trying to
+ * read past EOF in write mode (bug 1657).
+ *
- * Revision 1.8  2005/10/06 19:15:31  dmorissette
- * Collections: added support for reading/writing pen/brush/symbol ids and
@@ -434 +438 @@
- * or other cases that need to do random access in the file in write mode.)
- *
+ * bOffsetIsEndOfData is set to TRUE to indicate that the nOffset
+ * to which we are attempting to go is the end of the used data in this
+ * block (we are positioninig ourselves to append data), so if the nOffset 
+ * corresponds to the beginning of a 512 bytes block then we should really 
+ * be positioning ourselves at the end of the block that ends at this 
+ * address instead of at the beginning of the blocks that starts at this 
+ * address. This case can happen when going back and forth to write collection
+ * objects to a Coordblock and is documented in bug 1657.
+ *
- * Returns 0 if succesful or -1 if an error happened, in which case 
- * CPLError() will have been called.
- **********************************************************************/
-int     TABRawBinBlock::GotoByteInFile(int nOffset, 
-
+
+
-{
-    int nNewBlockPtr;
@@ -480 +494 @@
-        // CommitToFile() should only be called only if something changed.
-        //
-
-
-
-
-
-
+
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }