FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Andreas Ekstrand, The attached ESRIShape.cpp contains fixes for comparing calculated byte sizes with the content length from the record header. According to the ESRI Shape documentation (http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf), the content length is specified in 16 bit words, which is why I have multiplied it by 2 when comparing to byte sizes. Note that the comparison in line 813 is made with a fix number of 16-bit words so it hasn't been changed.

Browse Source 
This fixes problems with PolygonZ records where the previous code was reading past the end of the record since it thought it had M values even if it didn't. I suspect the problem that James McGlone had back in 2006 was the same but reversed, when he tried to simply comment out the check, which was a (correctly) refused submission.""
This commit is contained in:
Robert Osfield 2012-09-05 10:24:10 +00:00
parent a5478cf910
commit e8c4a6785c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgPlugins/shp/ESRIShape.cpp
View File

@ -548,7 +548,7 @@ bool MultiPointM::read( int fd )
}
int X = 40 + (16 * numPoints);
if( rh.contentLength > X )
if( rh.contentLength*2 > X )
{
if( mRange.read(fd) == false )
return false;
@ -653,7 +653,7 @@ bool PolyLineM::read( int fd )
int X = 44 + (4 * numParts);
int Y = X + (16 * numPoints);
if( rh.contentLength > Y )
if( rh.contentLength*2 > Y )
{
mRange.read(fd);
mArray = new Double[numPoints];
@ -750,7 +750,7 @@ bool PolygonM::read( int fd )
int X = 44 + (4 * numParts);
int Y = X + (16 * numPoints);
if( rh.contentLength > Y )
if( rh.contentLength*2 > Y )
{
if( mRange.read(fd) == false )
return false;
@ -898,7 +898,7 @@ bool MultiPointZ::read( int fd )
int X = 40 + (16*numPoints);
int Y = X + 16 + (8*numPoints);
if( rh.contentLength > Y )
if( rh.contentLength*2 > Y )
{
if( mRange.read(fd) == false )
return false;
@ -1025,7 +1025,7 @@ bool PolyLineZ::read( int fd )
int Y = X + (15 * numPoints);
int Z = Y + 16 + (8 * numPoints);
if( rh.contentLength != Z )
if( rh.contentLength*2 != Z )
{
mRange.read(fd);
mArray = new Double[numPoints];
@ -1138,7 +1138,7 @@ bool PolygonZ::read( int fd )
int X = 44 + (4*numParts);
int Y = X + (16*numPoints);
int Z = Y + 16 + (8*numPoints);
if( rh.contentLength != Z )
if( rh.contentLength*2 != Z )
{
if( mRange.read(fd) == false )
return false;
@ -1288,7 +1288,7 @@ bool MultiPatch::read( int fd )
int X = W + (4 * numParts);
int Y = X + (16 *numPoints);
int Z = Y + 16 + (8 *numPoints);
if( rh.contentLength > Z )
if( rh.contentLength*2 > Z )
{
if( mRange.read(fd) == false )
return false;