[Xfce4-commits] <xfce4-panel:devel> Gracefully handle invalid sizes.

[Nick Schermer]

Updating branch refs/heads/devel
         to fa6bf45b08be59f1d0acc97676aa9f86a5ced2e8 (commit)
       from 13306681d7e88560ad9c8dedb69b4c07fc35a646 (commit)

commit fa6bf45b08be59f1d0acc97676aa9f86a5ced2e8
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Feb 1 20:21:35 2010 +0100

    Gracefully handle invalid sizes.

 libxfce4panel/xfce-panel-image.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index 2d5817c..44c8716 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -448,8 +448,10 @@ xfce_panel_image_scale_pixbuf (GdkPixbuf *source,
   gint    source_height;
 
   panel_return_val_if_fail (GDK_IS_PIXBUF (source), NULL);
-  panel_return_val_if_fail (dest_width > 0, NULL);
-  panel_return_val_if_fail (dest_height > 0, NULL);
+
+  /* we fail on invalid sizes */
+  if (G_UNLIKELY (dest_width <= 0 || dest_height <= 0))
+    return NULL;
 
   source_width = gdk_pixbuf_get_width (source);
   source_height = gdk_pixbuf_get_height (source);