Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixes #43295 : [Oracle] Remove assert on oracle instant client badly …
…initialized variable
  • Loading branch information
troopa81 authored and nyalldawson committed May 20, 2021
1 parent 643b422 commit 85e8715
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/providers/oracle/ocispatial/qsql_ocispatial.cpp
Expand Up @@ -2480,14 +2480,14 @@ bool QOCISpatialCols::convertToWkb( QVariant &v, int index )
QByteArray ba;
union wkbPtr ptr;

int nElems;
int nElems = 0;
if ( !getArraySize( sdoobj->elem_info, nElems ) )
{
qWarning() << "could not determine element info array size";
return false;
}

int nOrds;
int nOrds = 0;
if ( !getArraySize( sdoobj->ordinates, nOrds ) )
{
qWarning() << "could not determine ordinate array size";
Expand All @@ -2508,7 +2508,6 @@ bool QOCISpatialCols::convertToWkb( QVariant &v, int index )
sdoind->point.x == OCI_IND_NOTNULL &&
sdoind->point.y == OCI_IND_NOTNULL )
{
Q_ASSERT( nOrds == 0 );

double x, y, z = 0.0;
if ( !getValue( &sdoobj->point.x, x ) )
Expand Down

0 comments on commit 85e8715

Please sign in to comment.