gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-266-gc63deda)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  c63deda32d9480e7b5b5597d3fb1fed8e6591805 (commit)
      from  56c72d5f24d6c80d47d6c114a1bcae1156c68ce6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 libgeda/src/o_picture.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


=================
 Commit Messages
=================

commit c63deda32d9480e7b5b5597d3fb1fed8e6591805
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Fix null dereference when fallback image not loaded.
    
    In commit bccf15c104d6, a bug was introduced whereby libgeda
    dereferenced a NULL pointer.  If a picture object's image cannot be
    loaded, libgeda attempts to load a fallback image, and on failure,
    accesses a GError to retrieve the error message.  Unfortunately, the
    GError was not being passed to the image loading function, and was
    therefore uninitialised when it was dereferenced to obtain a message.
    
    Closes-bug: lp-904639

:100644 100644 82a5bac... 43b1124... M	libgeda/src/o_picture.c

=========
 Changes
=========

commit c63deda32d9480e7b5b5597d3fb1fed8e6591805
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Fix null dereference when fallback image not loaded.
    
    In commit bccf15c104d6, a bug was introduced whereby libgeda
    dereferenced a NULL pointer.  If a picture object's image cannot be
    loaded, libgeda attempts to load a fallback image, and on failure,
    accesses a GError to retrieve the error message.  Unfortunately, the
    GError was not being passed to the image loading function, and was
    therefore uninitialised when it was dereferenced to obtain a message.
    
    Closes-bug: lp-904639

diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index 82a5bac..43b1124 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -1231,11 +1231,11 @@ o_picture_get_fallback_pixbuf (TOPLEVEL *toplevel)
 
     filename = g_build_filename (toplevel->bitmap_directory,
                                  "gschem-warning.png", NULL);
-    pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+    pixbuf = gdk_pixbuf_new_from_file (filename, &error);
 
     if (pixbuf == NULL) {
       g_warning ( _("Failed to load fallback image %s: %s.\n"),
-                      filename, error->message);
+                  filename, error->message);
       g_error_free (error);
       failed = TRUE;
     }




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs