blob: 19eaf1c91a2a1c22613f5f0a400ae72b22e963ec (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
From 0fd1f66767ab3b71bef571bf734ce0038d696f4f Mon Sep 17 00:00:00 2001
From: José Aliste <jaliste@src.gnome.org>
Date: Fri, 26 Nov 2010 14:56:45 +0000
Subject: document: create_thumbnail_frame should return NULL when
source_pixbuf is NULL and width and height are not positive.
Fixes bug #594408
(cherry picked from commit 3d8180a605e8c98172e9e0e739e22b7f50ed7bad)
---
diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c
index d597127..6099b7f 100644
--- 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,
--
cgit v0.9.0.2
|
