Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix leak of GdkPixbufLoader in wxGTK wxAnimation

Browse Source 
Use wxGtkObject<> to ensure that the loader object is unref'd.

Also add a missing call to gdk_pixbuf_loader_close() for consistency.

Closes #17607.
This commit is contained in:
Vadim Zeitlin
2016-07-28 00:38:46 +02:00
parent 9dc7a89ccd
commit a8fbe51b45
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/animate.cpp
View File

@@ -23,6 +23,7 @@
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "wx/gtk/private/object.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@@ -116,6 +117,8 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
else else
loader = gdk_pixbuf_loader_new(); loader = gdk_pixbuf_loader_new();
wxGtkObject<GdkPixbufLoader> ensureUnrefLoader(loader);
if (!loader || if (!loader ||
error != NULL) // even if the loader was allocated, an error could have happened error != NULL) // even if the loader was allocated, an error could have happened
{ {
@@ -156,6 +159,7 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
if (!data_written) if (!data_written)
{ {
wxLogDebug("Could not read data from the stream..."); wxLogDebug("Could not read data from the stream...");
gdk_pixbuf_loader_close(loader, NULL);
return false; return false;
} }