Protect some internal members and require access through safe methods

(cherry picked from commit d0e5991f843ea47f5bb34fd9538376d332bc55e8)
qgis · Jan 22, 2020 · 920abf3 · 920abf3
1 parent 1593815
commit 920abf3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -663,7 +663,7 @@ bool QgsCoordinateReferenceSystem::loadFromDatabase( const QString &db, const QS
         d->setPj( QgsProjUtils::crsToSingleCrs( crs.get() ) );
       }
 
-      d->mIsValid = static_cast< bool >( d->mPj );
+      d->mIsValid = d->hasPj();
 #else
       OSRDestroySpatialReference( d->mCRS );
       d->mCRS = OSRNewSpatialReference( nullptr );
@@ -1472,7 +1472,7 @@ void QgsCoordinateReferenceSystem::setProjString( const QString &proj4String )
     d->setPj( QgsProjUtils::proj_pj_unique_ptr( proj_create( ctx, trimmed.toLatin1().constData() ) ) );
   }
 
-  if ( !d->mPj )
+  if ( !d->hasPj() )
   {
 #ifdef QGISDEBUG
     const int errNo = proj_context_errno( ctx );
@@ -1526,7 +1526,7 @@ bool QgsCoordinateReferenceSystem::setWktString( const QString &wkt, bool allowP
     d->setPj( QgsProjUtils::proj_pj_unique_ptr( proj_create_from_wkt( QgsProjContext::get(), wkt.toLatin1().constData(), nullptr, &warnings, &grammerErrors ) ) );
   }
 
-  res = static_cast< bool >( d->mPj );
+  res = d->hasPj();
   if ( !res )
   {
     QgsDebugMsg( QStringLiteral( "\n---------------------------------------------------------------" ) );
@@ -1570,16 +1570,16 @@ bool QgsCoordinateReferenceSystem::setWktString( const QString &wkt, bool allowP
   }
 
 #if PROJ_VERSION_MAJOR>=6
-  if ( d->mPj )
+  if ( d->hasPj() )
   {
     // try 1 - maybe we can directly grab the auth name and code from the crs already?
-    QString authName( proj_get_id_auth_name( d->mPj.get(), 0 ) );
-    QString authCode( proj_get_id_code( d->mPj.get(), 0 ) );
+    QString authName( proj_get_id_auth_name( d->threadLocalProjObject(), 0 ) );
+    QString authCode( proj_get_id_code( d->threadLocalProjObject(), 0 ) );
 
     if ( authName.isEmpty() || authCode.isEmpty() )
     {
       // try 2, use proj's identify method and see if there's a nice candidate we can use
-      QgsProjUtils::identifyCrs( d->mPj.get(), authName, authCode );
+      QgsProjUtils::identifyCrs( d->threadLocalProjObject(), authName, authCode );
     }
 
     if ( !authName.isEmpty() && !authCode.isEmpty() )
@@ -1668,14 +1668,14 @@ void QgsCoordinateReferenceSystem::setMapUnits()
 #endif
 
 #if PROJ_VERSION_MAJOR>=6
-  if ( !d->mPj )
+  if ( !d->hasPj() )
   {
     d->mMapUnits = QgsUnitTypes::DistanceUnknownUnit;
     return;
   }
 
   PJ_CONTEXT *context = QgsProjContext::get();
-  QgsProjUtils::proj_pj_unique_ptr coordinateSystem( proj_crs_get_coordinate_system( context, d->mPj.get() ) );
+  QgsProjUtils::proj_pj_unique_ptr coordinateSystem( proj_crs_get_coordinate_system( context, d->threadLocalProjObject() ) );
   if ( !coordinateSystem )
   {
     d->mMapUnits = QgsUnitTypes::DistanceUnknownUnit;

diff --git a/src/core/qgscoordinatereferencesystem_p.h b/src/core/qgscoordinatereferencesystem_p.h
@@ -70,7 +70,6 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
 #if PROJ_VERSION_MAJOR<6
       , mCRS( nullptr )
 #endif
-      , mValidationHint( other.mValidationHint )
       , mProj4( other.mProj4 )
       , mAxisInvertedDirty( other.mAxisInvertedDirty )
       , mAxisInverted( other.mAxisInverted )
@@ -152,11 +151,16 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
 
     // this is the "master" proj object, to be used as a template for new proj objects created on different threads ONLY.
     // Always use threadLocalProjObject() instead of this.
+
+  private:
     QgsProjUtils::proj_pj_unique_ptr mPj;
     PJ_CONTEXT *mPjParentContext = nullptr;
 
+  public:
+
     void setPj( QgsProjUtils::proj_pj_unique_ptr obj )
     {
+      QgsReadWriteLocker locker( mProjLock, QgsReadWriteLocker::Write );
       if ( mPj )
       {
         PJ_CONTEXT *tmpContext = proj_context_create();
@@ -169,6 +173,12 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
       mPjParentContext = QgsProjContext::get();
     }
 
+    bool hasPj() const
+    {
+      QgsReadWriteLocker locker( mProjLock, QgsReadWriteLocker::Read );
+      return static_cast< bool >( mPj );
+    }
+
 #else
     OGRSpatialReferenceH mCRS;
 #endif
@@ -182,9 +192,12 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
     mutable bool mAxisInverted = false;
 
 #if PROJ_VERSION_MAJOR>=6
+  private:
     mutable QReadWriteLock mProjLock;
     mutable QMap < PJ_CONTEXT *, PJ * > mProjObjects;
 
+  public:
+
     PJ *threadLocalProjObject() const
     {
       QgsReadWriteLocker locker( mProjLock, QgsReadWriteLocker::Read );