sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

[outh2] Don't crash when trying to parse an invalid json configuration file

Browse Source
This commit is contained in:
Nyall Dawson 2018-10-25 07:45:13 +10:00
parent b5dc84d7db
commit b8361e4f9e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/auth/oauth2/qgsauthoauth2config.cpp
View File

@ -334,7 +334,16 @@ bool QgsAuthOAuth2Config::loadConfigTxt(
QgsDebugMsg( QStringLiteral( "Error parsing JSON: %1" ).arg( QString( errStr ) ) );
return res;
}
QJsonWrapper::qvariant2qobject( variant.toMap(), this );
const QVariantMap variantMap = variant.toMap();
// safety check -- qvariant2qobject asserts if an non-matching property is found in the json
for ( QVariantMap::const_iterator iter = variantMap.constBegin(); iter != variantMap.constEnd(); ++iter )
{
QVariant property = this->property( iter.key().toLatin1() );
if ( !property.isValid() ) // e.g. not a auth config json file
return false;
}
QJsonWrapper::qvariant2qobject( variantMap, this );
break;
}
default: