diff options
| author | Alexander Larsson <alexl@redhat.com> | 2007-02-06 13:32:49 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-02-06 13:32:49 +0000 |
| commit | d61d502b03e9aa33960a421faa4d53350499385d (patch) | |
| tree | 744a479908de69905f55e3ef658cde1d31fdfc94 | |
| parent | 77be338ef6fe115a1dc87500f263229597819dac (diff) | |
| download | nautilus-d61d502b03e9aa33960a421faa4d53350499385d.tar.gz | |
Fix crash on broken images. (#403255) Patch from Lucas Mazzardo Veloso
2007-02-06 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-thumbnails.c:
(nautilus_thumbnail_load_image):
Fix crash on broken images. (#403255)
Patch from Lucas Mazzardo Veloso
svn path=/trunk/; revision=12726
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-thumbnails.c | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2007-02-06 Alexander Larsson <alexl@redhat.com> + * libnautilus-private/nautilus-thumbnails.c: + (nautilus_thumbnail_load_image): + Fix crash on broken images. (#403255) + Patch from Lucas Mazzardo Veloso + +2007-02-06 Alexander Larsson <alexl@redhat.com> + * libnautilus-private/nautilus-emblem-utils.c: OSX build fix. (#403255) Patch from dmacks@netspace.org diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c index 64f61757c..8b9c8df93 100644 --- a/libnautilus-private/nautilus-thumbnails.c +++ b/libnautilus-private/nautilus-thumbnails.c @@ -387,7 +387,9 @@ nautilus_thumbnail_load_image (const char *path, return NULL; } - if (!gdk_pixbuf_loader_close (loader, &error)) { + if (!gdk_pixbuf_loader_close (loader, &error) || + /* Seems we have to check this even if it returned TRUE (#403255) */ + error != NULL) { g_message ("Failed to close thumbnail pixbuf loader for %s: %s", path, error->message); g_object_unref (G_OBJECT (loader)); |