PyPI - GDAL - Versions diffs - 3.12.3__tar.gz → 3.12.4__tar.gz - Mend

@@ -4388,14 +4388,22 @@ void CPL_STDCALL PyCPLErrorHandler(CPLErr eErrClass, CPLErrorNum err_no, const c
         return;
     }
-    void* user_data = CPLGetErrorHandlerUserData();
+    PyObject* callable = (PyObject*)CPLGetErrorHandlerUserData();
     PyObject *psArgs;
     SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-    psArgs = Py_BuildValue("(iis)", eErrClass, err_no, pszErrorMsg );
-    PyObject_CallObject( (PyObject*)user_data, psArgs);
-    Py_XDECREF(psArgs);
+    if (!PyCallable_Check(callable))
+    {
+        PyErr_SetString( PyExc_RuntimeError,
+                         "PyCPLErrorHandler: Critical error: callback is not callable" );
+    }
+    else
+    {
+        psArgs = Py_BuildValue("(iis)", eErrClass, err_no, pszErrorMsg );
+        PyObject_CallObject( callable, psArgs);
+        Py_XDECREF(psArgs);
+    }
     SWIG_PYTHON_THREAD_END_BLOCK;
 }
@@ -4416,7 +4424,9 @@ void CPL_STDCALL PyCPLErrorHandler(CPLErr eErrClass, CPLErrorNum err_no, const c
      void* user_data = CPLGetErrorHandlerUserData();
      if( user_data != NULL )
      {
+         SWIG_PYTHON_THREAD_BEGIN_BLOCK;
          Py_XDECREF((PyObject*)user_data);
+         SWIG_PYTHON_THREAD_END_BLOCK;
      }
      CPLPopErrorHandler();
   }

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GDAL
-Version: 3.12.3
+Version: 3.12.4
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam, Howard Butler, Even Rouault
@@ -65,7 +65,7 @@ special about gdal.)
  * SWIG (4 or greater).
- * libgdal (3.12.3 or greater).
+ * libgdal (3.12.4 or greater).
  * numpy (1.0.0 or greater).  This is not force-required by the build,
    but many examples and utilities will not work without it.  At least

@@ -31,7 +31,7 @@ special about gdal.)
  * SWIG (4 or greater).
- * libgdal (3.12.3 or greater).
+ * libgdal (3.12.4 or greater).
  * numpy (1.0.0 or greater).  This is not force-required by the build,
    but many examples and utilities will not work without it.  At least

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GDAL
-Version: 3.12.3
+Version: 3.12.4
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam, Howard Butler, Even Rouault
@@ -65,7 +65,7 @@ special about gdal.)
  * SWIG (4 or greater).
- * libgdal (3.12.3 or greater).
+ * libgdal (3.12.4 or greater).
  * numpy (1.0.0 or greater).  This is not force-required by the build,
    but many examples and utilities will not work without it.  At least

@@ -1,5 +1,5 @@
 __package_name__ = "gdal-utils"
-gdal_utils_version = (3, 12, 3, 0)
+gdal_utils_version = (3, 12, 4, 0)
 __version__ = ".".join(str(i) for i in gdal_utils_version)
 __author__ = "Frank Warmerdam"
 __author_email__ = "warmerdam@pobox.com"

@@ -18,7 +18,7 @@ from setuptools import setup
 from setuptools import find_packages
 from setuptools import Extension
-version = '3.12.3'
+version = '3.12.4'
 # If CXX is defined in the environment, it will be used to link the .so
 # but setuptools will be confused if it is made of several words like 'ccache g++'

GDAL 3.12.3__tar.gz → 3.12.4__tar.gz