Skip to content

Commit 67d778f

Browse files
committedMay 29, 2017
[mssql] Fix debug spam when features have null geometry
1 parent ce3737e commit 67d778f

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed
 

‎src/providers/mssql/qgsmssqlfeatureiterator.cpp

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -328,12 +328,19 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature )
328328
if ( mSource->isSpatial() )
329329
{
330330
QByteArray ar = mQuery->record().value( mSource->mGeometryColName ).toByteArray();
331-
unsigned char* wkb = mParser.ParseSqlGeometry(( unsigned char* )ar.data(), ar.size() );
332-
if ( wkb )
331+
if ( !ar.isEmpty() )
333332
{
334-
QgsGeometry *g = new QgsGeometry();
335-
g->fromWkb( wkb, mParser.GetWkbLen() );
336-
feature.setGeometry( g );
333+
unsigned char* wkb = mParser.ParseSqlGeometry(( unsigned char* )ar.data(), ar.size() );
334+
if ( wkb )
335+
{
336+
QgsGeometry *g = new QgsGeometry();
337+
g->fromWkb( wkb, mParser.GetWkbLen() );
338+
feature.setGeometry( g );
339+
}
340+
else
341+
{
342+
feature.setGeometry( nullptr );
343+
}
337344
}
338345
else
339346
{

0 commit comments

Comments
 (0)
Please sign in to comment.