libdocument: Add more sanity checks to ev-document-misc.

[evince.git] / libdocument / ev-document-misc.c

diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c
index bfba1ec8b5a9a9cba848c8bd9f8f096a798898de..f1a309571e9f101b1ce3ffc6cb17023777eeec4b 100644 (file)
--- a/libdocument/ev-document-misc.c
+++ b/libdocument/ev-document-misc.c
@@ -56,7 +56,7 @@ create_thumbnail_frame (int        width,
        }
 
        /* make sure no one is passing us garbage */
-       g_assert (width_r >= 0 && height_r >= 0);
+       g_return_val_if_fail (width_r >= 0 && height_r >= 0, NULL);
 
        retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
                                 TRUE, 8,
@@ -180,6 +180,8 @@ ev_document_misc_surface_from_pixbuf (GdkPixbuf *pixbuf)
        cairo_surface_t *surface;
        cairo_t         *cr;
 
+       g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+
        surface = cairo_image_surface_create (gdk_pixbuf_get_has_alpha (pixbuf) ?
                                              CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24,
                                              gdk_pixbuf_get_width (pixbuf),
@@ -195,6 +197,8 @@ ev_document_misc_surface_from_pixbuf (GdkPixbuf *pixbuf)
 GdkPixbuf *
 ev_document_misc_pixbuf_from_surface (cairo_surface_t *surface)
 {
+       g_return_val_if_fail (surface, NULL);   
+
         return gdk_pixbuf_get_from_surface (surface,
                                             0, 0,
                                             cairo_image_surface_get_width (surface),