Hello community, here is the log from the commit of package python-cups for openSUSE:Factory checked in at Mon Mar 22 17:09:30 CET 2010. -------- --- python-cups/python-cups.changes 2010-02-13 15:35:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-cups/python-cups.changes 2010-03-22 14:37:02.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 22 14:35:09 CET 2010 - vuntz@opensuse.org + +- Update to version 1.9.49: + + Fix rh#567386. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pycups-1.9.48.tar.bz2 New: ---- pycups-1.9.49.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cups.spec ++++++ --- /var/tmp/diff_new_pack.f7PjFY/_old 2010-03-22 17:09:14.000000000 +0100 +++ /var/tmp/diff_new_pack.f7PjFY/_new 2010-03-22 17:09:14.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-cups (Version 1.9.48) +# spec file for package python-cups (Version 1.9.49) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: python-cups BuildRequires: cups-devel python-devel -Version: 1.9.48 +Version: 1.9.49 Release: 1 Group: Development/Libraries/Python License: GPLv2+ ++++++ pycups-1.9.48.tar.bz2 -> pycups-1.9.49.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.48/ChangeLog new/pycups-1.9.49/ChangeLog --- old/pycups-1.9.48/ChangeLog 2010-01-06 13:55:23.000000000 +0100 +++ new/pycups-1.9.49/ChangeLog 2010-02-23 17:30:02.000000000 +0100 @@ -1,3 +1,8 @@ +2010-02-23 Tim Waugh <twaugh@redhat.com> + + * cupsconnection.c (Connection_dealloc): Be more cautious when + removing the Connection object from the list (bug #567386). + 2010-01-06 Tim Waugh <twaugh@redhat.com> * cupsipp.c (IPPRequest_getAttributes): Continue to next diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.48/Makefile new/pycups-1.9.49/Makefile --- old/pycups-1.9.48/Makefile 2010-01-19 13:34:47.000000000 +0100 +++ new/pycups-1.9.49/Makefile 2010-03-10 10:45:10.000000000 +0100 @@ -1,5 +1,5 @@ NAME=pycups -VERSION=1.9.48 +VERSION=1.9.49 SOURCES=cupsmodule.c cupsconnection.c cupsppd.c cupsipp.c setup.py \ cupsppd.h cupsipp.h cupsconnection.h cupsmodule.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.48/cupsconnection.c new/pycups-1.9.49/cupsconnection.c --- old/pycups-1.9.48/cupsconnection.c 2010-01-14 14:22:03.000000000 +0100 +++ new/pycups-1.9.49/cupsconnection.c 2010-02-24 16:07:28.000000000 +0100 @@ -231,37 +231,43 @@ { int i, j; - if (NumConnections > 1) - { - Connection **new_array = calloc (NumConnections - 1, - sizeof (Connection *)); + for (j = 0; j < NumConnections; j++) + if (Connections[j] == self) + break; - for (i = 0, j = 0; i < NumConnections; i++) + if (j < NumConnections) + { + if (NumConnections > 1) { - if (Connections[i] == self) + Connection **new_array = calloc (NumConnections - 1, + sizeof (Connection *)); + + if (new_array) { - if (!new_array) - Connections[i] = NULL; + int k; + for (i = 0, k = 0; i < NumConnections; i++) + { + if (i == j) + continue; - continue; - } + new_array[k++] = Connections[i]; + } - if (new_array) - new_array[j++] = Connections[i]; + free (Connections); + Connections = new_array; + NumConnections--; + } else + /* Failed to allocate memory. Just clear out the reference. */ + Connections[j] = NULL; } - - if (new_array) { + else + { + /* The only element is the one we no longer need. */ free (Connections); - Connections = new_array; - NumConnections--; + Connections = NULL; + NumConnections = 0; } } - else - { - free (Connections); - Connections = NULL; - NumConnections = 0; - } if (self->http) { debugprintf ("httpClose()\n"); @@ -3432,6 +3438,7 @@ if (UTF8_from_PyObj (&printer, printerobj) == NULL) return NULL; + debugprintf ("-> Connection_getPPD()\n"); Connection_begin_allow_threads (self); ppdfile = cupsGetPPD2 (self->http, printer); Connection_end_allow_threads (self); @@ -3443,10 +3450,12 @@ else PyErr_SetString (PyExc_RuntimeError, "cupsGetPPD2 failed"); + debugprintf ("<- Connection_getPPD() (error)\n"); return NULL; } ret = PyString_FromString (ppdfile); + debugprintf ("<- Connection_getPPD() = %s\n", ppdfile); return ret; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org