Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 09:40:07 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update siplib source

Browse Source
This commit is contained in:
Robin Dunn
2020-06-16 20:43:20 -07:00
parent e10edf0991
commit 815a5eae5e
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sip/siplib/sip.h
View File

@@ -1,7 +1,7 @@
/*
* The SIP module interface.
*
* Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2020 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -54,8 +54,8 @@ extern "C" {
/*
* Define the SIP version number.
*/
#define SIP_VERSION 0x041313
#define SIP_VERSION_STR "4.19.19"
#define SIP_VERSION 0x041317
#define SIP_VERSION_STR "4.19.23"
/*

19
sip/siplib/siplib.c
View File

@@ -1,7 +1,7 @@
/*
* SIP library code.
*
* Copyright (c) 2019 Riverbank Computing Limited <info@riverbankcomputing.com>
* Copyright (c) 2020 Riverbank Computing Limited <info@riverbankcomputing.com>
*
* This file is part of SIP.
*
@@ -9338,6 +9338,7 @@ static PyObject *sip_api_get_reference(PyObject *self, int key)
return NULL;
obj = PyDict_GetItem(dict, key_obj);
Py_DECREF(key_obj);
Py_XINCREF(obj);
return obj;
@@ -11320,6 +11321,11 @@ static SIP_SSIZE_T sipSimpleWrapper_getcharbuffer(sipSimpleWrapper *self,
*/
static void sipSimpleWrapper_dealloc(sipSimpleWrapper *self)
{
PyObject *error_type, *error_value, *error_traceback;
/* Save the current exception, if any. */
PyErr_Fetch(&error_type, &error_value, &error_traceback);
forgetObject(self);
/*
@@ -11331,6 +11337,9 @@ static void sipSimpleWrapper_dealloc(sipSimpleWrapper *self)
/* Call the standard super-type dealloc. */
PyBaseObject_Type.tp_dealloc((PyObject *)self);
/* Restore the saved exception. */
PyErr_Restore(error_type, error_value, error_traceback);
}
@@ -11727,6 +11736,11 @@ static int sipWrapper_clear(sipWrapper *self)
*/
static void sipWrapper_dealloc(sipWrapper *self)
{
PyObject *error_type, *error_value, *error_traceback;
/* Save the current exception, if any. */
PyErr_Fetch(&error_type, &error_value, &error_traceback);
/*
* We can't simply call the super-type because things have to be done in a
* certain order. The first thing is to get rid of the wrapped instance.
@@ -11737,6 +11751,9 @@ static void sipWrapper_dealloc(sipWrapper *self)
/* Skip the super-type's dealloc. */
PyBaseObject_Type.tp_dealloc((PyObject *)self);
/* Restore the saved exception. */
PyErr_Restore(error_type, error_value, error_traceback);
}