From 58d46fd57641c96a5e8bffedda9c95ac315302b2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 6 Nov 2022 19:38:48 +0100
Subject: [PATCH] cppcheck fixes

---
 frmts/grib/gribdataset.cpp                       | 2 +-
 ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frmts/grib/gribdataset.cpp b/frmts/grib/gribdataset.cpp
index 7e386c2e9de7..c1b004d3b873 100644
--- a/frmts/grib/gribdataset.cpp
+++ b/frmts/grib/gribdataset.cpp
@@ -1193,7 +1193,7 @@ class InventoryWrapperSidecar : public gdal::grib::InventoryWrapper
             else
             {
                 inv_[i].subgNum =
-                    static_cast<unsigned short>(strtol(aosNum[1], &endptr, 10));
+                    static_cast<int>(strtol(aosNum[1], &endptr, 10));
                 if (*endptr != 0) goto err_sidecar;
                 if( inv_[i].subgNum <= 0 )
                     goto err_sidecar;
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
index 432a7fd5eb65..4a8826df44cd 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -6338,7 +6338,8 @@ OGRGeometryTypeCounter* OGRGeoPackageTableLayer::GetGeometryTypes(
         static int ProgressHandler(void* pData)
         {
             CancelCallback* psCancelCallback = static_cast<CancelCallback*>(pData);
-            return psCancelCallback->m_pfnProgress(0.0, "", psCancelCallback->m_pProgressData) ? 0 : 1;
+            return psCancelCallback->m_pfnProgress != nullptr &&
+                   psCancelCallback->m_pfnProgress(0.0, "", psCancelCallback->m_pProgressData) ? 0 : 1;
         }
     };