From 333f4c43256867b9cba26950727ce7a03af4e90f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 10 Sep 2000 16:04:33 +0000 Subject: [PATCH] Add a missing g_return_if_fail(). Sat Sep 9 18:50:42 2000 Owen Taylor * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail(). --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ glib/gstrfuncs.c | 13 +++++++++---- gstrfuncs.c | 13 +++++++++---- 10 files changed, 50 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae06b98b3..5a19170f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Sep 9 18:50:42 2000 Owen Taylor + + * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail(). + Mon Aug 21 03:57:46 2000 Tim Janik * glib.h (G_BREAKPOINT): for non-i386 and non-alpha, or non gcc, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ae06b98b3..5a19170f7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Sat Sep 9 18:50:42 2000 Owen Taylor + + * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail(). + Mon Aug 21 03:57:46 2000 Tim Janik * glib.h (G_BREAKPOINT): for non-i386 and non-alpha, or non gcc, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ae06b98b3..5a19170f7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Sat Sep 9 18:50:42 2000 Owen Taylor + + * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail(). + Mon Aug 21 03:57:46 2000 Tim Janik * glib.h (G_BREAKPOINT): for non-i386 and non-alpha, or non gcc, diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ae06b98b3..5a19170f7 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +Sat Sep 9 18:50:42 2000 Owen Taylor + + * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail(). + Mon Aug 21 03:57:46 2000 Tim Janik * glib.h (G_BREAKPOINT): for non-i386 and non-alpha, or non gcc, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ae06b98b3..5a19170f7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Sat Sep 9 18:50:42 2000 Owen Taylor + + * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail(). + Mon Aug 21 03:57:46 2000 Tim Janik * glib.h (G_BREAKPOINT): for non-i386 and non-alpha, or non gcc, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ae06b98b3..5a19170f7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Sat Sep 9 18:50:42 2000 Owen Taylor + + * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail(). + Mon Aug 21 03:57:46 2000 Tim Janik * glib.h (G_BREAKPOINT): for non-i386 and non-alpha, or non gcc, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ae06b98b3..5a19170f7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Sat Sep 9 18:50:42 2000 Owen Taylor + + * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail(). + Mon Aug 21 03:57:46 2000 Tim Janik * glib.h (G_BREAKPOINT): for non-i386 and non-alpha, or non gcc, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ae06b98b3..5a19170f7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Sat Sep 9 18:50:42 2000 Owen Taylor + + * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail(). + Mon Aug 21 03:57:46 2000 Tim Janik * glib.h (G_BREAKPOINT): for non-i386 and non-alpha, or non gcc, diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 2a0a31d47..21dc2597b 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -1152,11 +1152,16 @@ gchar * g_strescape (const gchar *source, const gchar *exceptions) { - const guchar *p = (guchar *) source; - /* Each source byte needs maximally four destination chars (\777) */ - gchar *dest = g_malloc (strlen (source) * 4 + 1); - gchar *q = dest; + const guchar *p; + gchar *dest; + gchar *q; guchar excmap[256]; + + g_return_val_if_fail (source != NULL, NULL); + + p = (guchar *) source; + /* Each source byte needs maximally four destination chars (\777) */ + q = dest = g_malloc (strlen (source) * 4 + 1); memset (excmap, 0, 256); if (exceptions) diff --git a/gstrfuncs.c b/gstrfuncs.c index 2a0a31d47..21dc2597b 100644 --- a/gstrfuncs.c +++ b/gstrfuncs.c @@ -1152,11 +1152,16 @@ gchar * g_strescape (const gchar *source, const gchar *exceptions) { - const guchar *p = (guchar *) source; - /* Each source byte needs maximally four destination chars (\777) */ - gchar *dest = g_malloc (strlen (source) * 4 + 1); - gchar *q = dest; + const guchar *p; + gchar *dest; + gchar *q; guchar excmap[256]; + + g_return_val_if_fail (source != NULL, NULL); + + p = (guchar *) source; + /* Each source byte needs maximally four destination chars (\777) */ + q = dest = g_malloc (strlen (source) * 4 + 1); memset (excmap, 0, 256); if (exceptions)