fix-leaks-of-pango-objects.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  1. From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001
  2. From: "Owen W. Taylor" <otaylor@fishsoup.net>
  3. Date: Tue, 27 Sep 2011 00:17:52 -0400
  4. Subject: Fix leaks of Pango objects
  5. Gtk.PrintContext.create_pango_context()
  6. Gtk.PrintContext.create_pango_layout()
  7. pangocairo.CairoContext.create_layout()
  8. were leaking the objects they returned.
  9. https://bugzilla.gnome.org/show_bug.cgi?id=660216
  10. diff --git a/gtk/gtk-2.10.defs b/gtk/gtk-2.10.defs
  11. index 69c7e0c..faa45e1 100644
  12. --- a/gtk/gtk-2.10.defs
  13. +++ b/gtk/gtk-2.10.defs
  14. @@ -1388,12 +1388,14 @@
  15. (define-method create_pango_context
  16. (of-object "GtkPrintContext")
  17. (c-name "gtk_print_context_create_pango_context")
  18. + (caller-owns-return #t)
  19. (return-type "PangoContext*")
  20. )
  21. (define-method create_pango_layout
  22. (of-object "GtkPrintContext")
  23. (c-name "gtk_print_context_create_pango_layout")
  24. + (caller-owns-return #t)
  25. (return-type "PangoLayout*")
  26. )
  27. diff --git a/pangocairo.override b/pangocairo.override
  28. index bb923e6..5101107 100644
  29. --- a/pangocairo.override
  30. +++ b/pangocairo.override
  31. @@ -118,11 +118,16 @@ _wrap_pango_cairo_update_context(PyGObject *self, PyObject *args, PyObject *kwar
  32. static PyObject *
  33. _wrap_pango_cairo_create_layout(PyGObject *self)
  34. {
  35. - PangoLayout *ret;
  36. + PangoLayout *layout;
  37. + PyObject *ret;
  38. - ret = pango_cairo_create_layout(PycairoContext_GET(self));
  39. + layout = pango_cairo_create_layout(PycairoContext_GET(self));
  40. /* pygobject_new handles NULL checking */
  41. - return pygobject_new((GObject *)ret);
  42. + ret = pygobject_new((GObject *)layout);
  43. + if (layout)
  44. + g_object_unref(layout);
  45. +
  46. + return ret;
  47. }
  48. static PyObject *
  49. --
  50. cgit v0.10.2