2007-12-11 Tim Waugh <[email protected]>

* cupsppd.c (Option_getChoices): Don't leak Unicode objects. git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pycups/trunk@263 e7545f15-59ab-4934-8816-61942c173d0f
Distrotech · Dec 11, 2007 · 56957d6 · 56957d6
1 parent 5b5858b
commit 56957d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-11  Tim Waugh  <[email protected]>
+
+	* cupsppd.c (Option_getChoices): Don't leak Unicode objects.
+
 2007-11-30  Tim Waugh  <[email protected]>
 
 	* cupsconnection.c (do_printer_request): Fixed debugging output.

diff --git a/cupsppd.c b/cupsppd.c
@@ -833,12 +833,16 @@ Option_getChoices (Option *self, void *closure)
        i < self->option->num_choices;
        i++, choice++) {
     PyObject *choice_dict = PyDict_New ();
-    PyDict_SetItemString (choice_dict, "choice",
-			  make_PyUnicode_from_ppd_string (self->ppd,
-							  choice->choice));
-    PyDict_SetItemString (choice_dict, "text",
-			  make_PyUnicode_from_ppd_string (self->ppd,
-							  choice->text));
+    PyObject *u;
+
+    u = make_PyUnicode_from_ppd_string (self->ppd, choice->choice);
+    PyDict_SetItemString (choice_dict, "choice", u);
+    Py_DECREF (u);
+
+    u = make_PyUnicode_from_ppd_string (self->ppd, choice->text);
+    PyDict_SetItemString (choice_dict, "text", u);
+    Py_DECREF (u);
+
     PyList_Append (choices, choice_dict);
     if (!strcmp (choice->choice, self->option->defchoice))
       defchoice_seen = true;