Add a missing g_return_if_fail().

Sat Sep  9 18:50:42 2000  Owen Taylor  <otaylor@redhat.com>

	* gstrfuncs.c (g_strescape): Add a missing g_return_if_fail().

diff --git a/ChangeLog b/ChangeLog
index ae06b98b36a01103faf2dc277229ffe692ba7372..5a19170f784bbd886b19899f68ebbb4bb0005983 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep  9 18:50:42 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail().
+
 Mon Aug 21 03:57:46 2000  Tim Janik  <timj@gtk.org>
 
        * 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 ae06b98b36a01103faf2dc277229ffe692ba7372..5a19170f784bbd886b19899f68ebbb4bb0005983 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Sat Sep  9 18:50:42 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail().
+
 Mon Aug 21 03:57:46 2000  Tim Janik  <timj@gtk.org>
 
        * 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 ae06b98b36a01103faf2dc277229ffe692ba7372..5a19170f784bbd886b19899f68ebbb4bb0005983 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Sat Sep  9 18:50:42 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail().
+
 Mon Aug 21 03:57:46 2000  Tim Janik  <timj@gtk.org>
 
        * 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 ae06b98b36a01103faf2dc277229ffe692ba7372..5a19170f784bbd886b19899f68ebbb4bb0005983 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Sat Sep  9 18:50:42 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail().
+
 Mon Aug 21 03:57:46 2000  Tim Janik  <timj@gtk.org>
 
        * 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 ae06b98b36a01103faf2dc277229ffe692ba7372..5a19170f784bbd886b19899f68ebbb4bb0005983 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Sat Sep  9 18:50:42 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail().
+
 Mon Aug 21 03:57:46 2000  Tim Janik  <timj@gtk.org>
 
        * 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 ae06b98b36a01103faf2dc277229ffe692ba7372..5a19170f784bbd886b19899f68ebbb4bb0005983 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Sat Sep  9 18:50:42 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail().
+
 Mon Aug 21 03:57:46 2000  Tim Janik  <timj@gtk.org>
 
        * 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 ae06b98b36a01103faf2dc277229ffe692ba7372..5a19170f784bbd886b19899f68ebbb4bb0005983 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Sat Sep  9 18:50:42 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail().
+
 Mon Aug 21 03:57:46 2000  Tim Janik  <timj@gtk.org>
 
        * 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 ae06b98b36a01103faf2dc277229ffe692ba7372..5a19170f784bbd886b19899f68ebbb4bb0005983 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Sat Sep  9 18:50:42 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gstrfuncs.c (g_strescape): Add a missing g_return_if_fail().
+
 Mon Aug 21 03:57:46 2000  Tim Janik  <timj@gtk.org>
 
        * glib.h (G_BREAKPOINT): for non-i386 and non-alpha, or non gcc,

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 2a0a31d4751bd88e0553665c781e811cd232b613..21dc2597bda3d9a39f94d88cf710a29c3fa1f6e2 100644 (file)
--- 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 2a0a31d4751bd88e0553665c781e811cd232b613..21dc2597bda3d9a39f94d88cf710a29c3fa1f6e2 100644 (file)
--- 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)