Fix crash in testqgsogrutils with QT5 where QTextCodec::codecForName( "System" ) returns null

rouault · rouault · commit aa2014de5dd2 · 2016-04-25T20:20:25.000+02:00
diff --git a/src/core/qgsogrutils.cpp b/src/core/qgsogrutils.cpp
@@ -72,7 +72,7 @@ QgsFields QgsOgrUtils::readOgrFields( OGRFeatureH ogrFet, QTextCodec* encoding )
       continue;
     }
 
-    QString name = encoding->toUnicode( OGR_Fld_GetNameRef( fldDef ) );
+    QString name = encoding ? encoding->toUnicode( OGR_Fld_GetNameRef( fldDef ) ) : QString::fromUtf8( OGR_Fld_GetNameRef( fldDef ) );
     QVariant::Type varType;
     switch ( OGR_Fld_GetType( fldDef ) )
     {
@@ -137,8 +137,13 @@ QVariant QgsOgrUtils::getOgrFeatureAttribute( OGRFeatureH ogrFet, const QgsField
     switch ( fields.at( attIndex ).type() )
     {
       case QVariant::String:
-        value = QVariant( encoding->toUnicode( OGR_F_GetFieldAsString( ogrFet, attIndex ) ) );
+      {
+        if ( encoding )
+          value = QVariant( encoding->toUnicode( OGR_F_GetFieldAsString( ogrFet, attIndex ) ) );
+        else
+          value = QVariant( QString::fromUtf8( OGR_F_GetFieldAsString( ogrFet, attIndex ) ) );
         break;
+      }
       case QVariant::Int:
         value = QVariant( OGR_F_GetFieldAsInteger( ogrFet, attIndex ) );
         break;
