fix invalid delete (upstream ticket #11)

This commit is contained in:
Zdenek Dohnal 2020-12-14 15:45:12 +01:00
parent a3d0a0d293
commit c5cbcc3c85
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,21 @@
diff --git a/cupsconnection.c b/cupsconnection.c
index 132dd25..d54a7fa 100644
--- a/cupsconnection.c
+++ b/cupsconnection.c
@@ -3827,7 +3827,7 @@ Connection_printTestPage (Connection *self, PyObject *args, PyObject *kwds)
const char *datadir;
char filename[PATH_MAX];
char uri[HTTP_MAX_URI];
- ipp_t *request, *answer;
+ ipp_t *request, *answer = NULL;
ipp_attribute_t *attr;
char *resource;
int jobid = 0;
@@ -3923,6 +3923,7 @@ Connection_printTestPage (Connection *self, PyObject *args, PyObject *kwds)
Connection_end_allow_threads (self);
if (answer && ippGetStatusCode (answer) == IPP_NOT_POSSIBLE) {
ippDelete (answer);
+ answer = NULL;
// Perhaps it's a class, not a printer.
construct_uri (uri, sizeof (uri),
"ipp://localhost/classes/", printer);

View File

@ -6,7 +6,7 @@
Summary: Python bindings for CUPS
Name: python-cups
Version: 2.0.1
Release: 6%{?dist}
Release: 7%{?dist}
# older URL, but still with useful information about pycups
#URL: http://cyberelk.net/tim/software/pycups/
URL: https://github.com/OpenPrinting/pycups/
@ -16,6 +16,7 @@ License: GPLv2+
# all taken from upstream
Patch01: 0001-examples-cupstree.py-remove-shebang.patch
Patch02: 0001-postscriptdriver.prov-ignore-driverless-utilities.patch
Patch03: pycups-invalid-pointer.patch
# gcc is no longer in buildroot by default
BuildRequires: gcc
@ -73,6 +74,9 @@ export PYTHONPATH=%{buildroot}%{python3_sitearch}
%doc examples html
%changelog
* Mon Dec 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-7
- fix invalid delete (upstream ticket #11)
* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2.0.1-6
- make is no longer in buildroot by default
- use smaller git-core instead of git