Explicitly cast Exif GPSTimeStamp from double to int and min/max hh:m…

…m:ss values
qgis · Jul 3, 2024 · bd17c01 · bd17c01
1 parent 75915eb
commit bd17c01
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/core/raster/qgsexiftools.cpp b/src/core/raster/qgsexiftools.cpp
@@ -165,9 +165,10 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it
     const QStringList parts = QString::fromStdString( it->toString() ).split( QRegularExpression( QStringLiteral( "\\s+" ) ) );
     if ( parts.size() == 3 )
     {
-      const int hour = readRational( it->value(), 0 );
-      const int minute = readRational( it->value(), 1 );
-      const int second = readRational( it->value(), 2 );
+      const int hour = std::max( 0, std::min( 23, static_cast< int >( readRational( it->value(), 0 ) ) ) );
+      const int minute = std::max( 0, std::min( 59, static_cast< int >( readRational( it->value(), 1 ) ) ) );
+      const int second = std::max( 0, std::min( 59, static_cast< int >( readRational( it->value(), 2 ) ) ) );
+
       val = QVariant::fromValue( QTime::fromString( QStringLiteral( "%1:%2:%3" )
                                  .arg( QString::number( hour ).rightJustified( 2, '0' ) )
                                  .arg( QString::number( minute ).rightJustified( 2, '0' ) )