From fdade41dc6db2b11dc265ae6aee4fdd2ce2b78b8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 Apr 2003 18:50:48 +0000 Subject: [PATCH] Add sanity checks for GError handling. (#108345) --- gdk-pixbuf/ChangeLog | 11 +++++++++++ gdk-pixbuf/gdk-pixbuf-animation.c | 1 + gdk-pixbuf/gdk-pixbuf-io.c | 4 ++++ gdk-pixbuf/gdk-pixbuf-loader.c | 5 ++++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 821e783c34..4672da7ff6 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,14 @@ +2003-04-24 Matthias Clasen + + * gdk-pixbuf-loader.c (gdk_pixbuf_loader_write): + (gdk_pixbuf_loader_new_with_type): + (gdk_pixbuf_loader_close): + * gdk-pixbuf-io.c (gdk_pixbuf_new_from_file): + (gdk_pixbuf_save): + (gdk_pixbuf_savev): + * gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file): + Add sanity checks for GError handling. (#108345) + 2003-03-21 Matthias Clasen * gdk-pixbuf-animation.c (gdk_pixbuf_non_anim_get_type): Add diff --git a/gdk-pixbuf/gdk-pixbuf-animation.c b/gdk-pixbuf/gdk-pixbuf-animation.c index 354cc7740c..0a496bb7ad 100644 --- a/gdk-pixbuf/gdk-pixbuf-animation.c +++ b/gdk-pixbuf/gdk-pixbuf-animation.c @@ -137,6 +137,7 @@ gdk_pixbuf_animation_new_from_file (const char *filename, GdkPixbufModule *image_module; g_return_val_if_fail (filename != NULL, NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); f = fopen (filename, "rb"); if (!f) { diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 3c677632fe..a90a291066 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -727,6 +727,7 @@ gdk_pixbuf_new_from_file (const char *filename, GdkPixbufModule *image_module; g_return_val_if_fail (filename != NULL, NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); f = fopen (filename, "rb"); if (!f) { @@ -948,6 +949,8 @@ gdk_pixbuf_save (GdkPixbuf *pixbuf, va_list args; gboolean result; + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + va_start (args, error); collect_save_options (args, &keys, &values); @@ -994,6 +997,7 @@ gdk_pixbuf_savev (GdkPixbuf *pixbuf, g_return_val_if_fail (filename != NULL, FALSE); g_return_val_if_fail (type != NULL, FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); f = fopen (filename, "wb"); diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index bf3602763e..79f7230a91 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -423,6 +423,7 @@ gdk_pixbuf_loader_write (GdkPixbufLoader *loader, g_return_val_if_fail (buf != NULL, FALSE); g_return_val_if_fail (count >= 0, FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); priv = loader->priv; @@ -499,11 +500,12 @@ gdk_pixbuf_loader_new_with_type (const char *image_type, { GdkPixbufLoader *retval; GError *tmp; + g_return_val_if_fail (error == NULL || *error == NULL, NULL); retval = g_object_new (GDK_TYPE_PIXBUF_LOADER, NULL); tmp = NULL; - gdk_pixbuf_loader_load_module(retval, image_type, &tmp); + gdk_pixbuf_loader_load_module (retval, image_type, &tmp); if (tmp != NULL) { g_propagate_error (error, tmp); @@ -602,6 +604,7 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader, g_return_val_if_fail (loader != NULL, TRUE); g_return_val_if_fail (GDK_IS_PIXBUF_LOADER (loader), TRUE); + g_return_val_if_fail (error == NULL || *error == NULL, TRUE); priv = loader->priv;