From a41e604f83108e6659d7747efce50a95f22da0a8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 13 Apr 2014 21:23:53 +0100 Subject: [PATCH] Only set ok value if not NULL pointer --- src/libtomahawk/utils/TomahawkUtils.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp index 4c6b735c9..11bee026e 100644 --- a/src/libtomahawk/utils/TomahawkUtils.cpp +++ b/src/libtomahawk/utils/TomahawkUtils.cpp @@ -852,7 +852,10 @@ parseJson( const QByteArray& jsonData, bool* ok ) #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) QJsonParseError error; QJsonDocument doc = QJsonDocument::fromJson( jsonData, &error ); - *ok = ( error.error == QJsonParseError::NoError ); + if ( ok != NULL ) + { + *ok = ( error.error == QJsonParseError::NoError ); + } return doc.toVariant(); #else QJson::Parser p; @@ -866,7 +869,10 @@ toJson( const QVariant &variant, bool* ok ) { #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) QJsonDocument doc = QJsonDocument::fromVariant( variant ); - *ok = true; + if ( ok != NULL ) + { + *ok = true; + } return doc.toJson(); #else QJson::Serializer serializer;