GPKG: avoid invalide use of pointer aliasing that caused ICC 2024.0.2…

….29 to generate invalid code (refs OSGeo#9508)
rouault · Mar 20, 2024 · 0e37acf · 0e37acf
1 parent be7c893
commit 0e37acf
Showing 1 changed file with 22 additions and 18 deletions.
diff --git a/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp b/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
@@ -508,31 +508,32 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::ReadTile(
             for (size_t i = 0;
                  i < static_cast<size_t>(nBlockXSize) * nBlockYSize; i++)
             {
-                const GUInt16 nVal = *reinterpret_cast<GUInt16 *>(
-                    pabyTileData + i * sizeof(GUInt16));
+                GUInt16 usVal;
+                memcpy(&usVal, pabyTileData + i * sizeof(GUInt16),
+                       sizeof(usVal));
                 double dfVal =
-                    floor((nVal * dfTileScale + dfTileOffset) * m_dfScale +
+                    floor((usVal * dfTileScale + dfTileOffset) * m_dfScale +
                           m_dfOffset + 0.5);
-                if (bHasNoData && nVal == m_usGPKGNull)
+                if (bHasNoData && usVal == m_usGPKGNull)
                     dfVal = dfNoDataValue;
                 if (dfVal > 32767)
                     dfVal = 32767;
                 else if (dfVal < -32768)
                     dfVal = -32768;
-                *reinterpret_cast<GInt16 *>(pabyTileData + i * sizeof(GInt16)) =
-                    static_cast<GInt16>(dfVal);
+                GInt16 sVal = static_cast<GInt16>(dfVal);
+                memcpy(pabyTileData + i * sizeof(GUInt16), &sVal, sizeof(sVal));
             }
         }
         else if (m_eDT == GDT_UInt16 &&
                  (m_dfOffset != 0.0 || m_dfScale != 1.0 ||
                   dfTileOffset != 0.0 || dfTileScale != 1.0))
         {
             CPLAssert(eRequestDT == GDT_UInt16);
+            GUInt16 *psVal = reinterpret_cast<GUInt16 *>(pabyTileData);
             for (size_t i = 0;
                  i < static_cast<size_t>(nBlockXSize) * nBlockYSize; i++)
             {
-                const GUInt16 nVal = *reinterpret_cast<GUInt16 *>(
-                    pabyTileData + i * sizeof(GUInt16));
+                const GUInt16 nVal = psVal[i];
                 double dfVal =
                     floor((nVal * dfTileScale + dfTileOffset) * m_dfScale +
                           m_dfOffset + 0.5);
@@ -542,9 +543,7 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::ReadTile(
                     dfVal = 65535;
                 else if (dfVal < 0)
                     dfVal = 0;
-                *reinterpret_cast<GUInt16 *>(pabyTileData +
-                                             i * sizeof(GUInt16)) =
-                    static_cast<GUInt16>(dfVal);
+                psVal[i] = static_cast<GUInt16>(dfVal);
             }
         }
         else if (m_eDT == GDT_Float32 && eRequestDT == GDT_UInt16)
@@ -555,16 +554,21 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::ReadTile(
                      static_cast<GPtrDiff_t>(nBlockXSize) * nBlockYSize - 1;
                  i >= 0; i--)
             {
-                const GUInt16 nVal = *reinterpret_cast<GUInt16 *>(
-                    pabyTileData + i * sizeof(GUInt16));
-                double dfVal = (nVal * dfTileScale + dfTileOffset) * m_dfScale +
-                               m_dfOffset;
+                // Use memcpy() and not reinterpret_cast<GUInt16*> and
+                // reinterpret_cast<float*>, otherwise compilers such as ICC
+                // may (ab)use rules about aliasing to generate wrong code!
+                GUInt16 usVal;
+                memcpy(&usVal, pabyTileData + i * sizeof(GUInt16),
+                       sizeof(usVal));
+                double dfVal =
+                    (usVal * dfTileScale + dfTileOffset) * m_dfScale +
+                    m_dfOffset;
                 if (m_dfPrecision == 1.0)
                     dfVal = floor(dfVal + 0.5);
-                if (bHasNoData && nVal == m_usGPKGNull)
+                if (bHasNoData && usVal == m_usGPKGNull)
                     dfVal = dfNoDataValue;
-                *reinterpret_cast<float *>(pabyTileData + i * sizeof(float)) =
-                    static_cast<float>(dfVal);
+                const float fVal = static_cast<float>(dfVal);
+                memcpy(pabyTileData + i * sizeof(float), &fVal, sizeof(fVal));
             }
         }