From: Matthias Clasen <maclas@gmx.de>
Date: Sun, 6 Apr 2003 22:16:59 +0000 (+0000)
Subject: Warn if p == NULL && max != 0. (#110087)
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=048002c8f74d8779f24085edcb790ee71cc93329;p=dana%2Fcg-glib.git

Warn if p == NULL && max != 0. (#110087)

2003-04-07  Matthias Clasen  <maclas@gmx.de>

	* glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0.
	(#110087)
---

diff --git a/ChangeLog b/ChangeLog
index fbb6f35a..ef656698 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-07  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0.
+	(#110087) 
+
 2003-04-01  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/glib.def: Add g_string_chunk_insert_len.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fbb6f35a..ef656698 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-04-07  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0.
+	(#110087) 
+
 2003-04-01  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/glib.def: Add g_string_chunk_insert_len.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index fbb6f35a..ef656698 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2003-04-07  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0.
+	(#110087) 
+
 2003-04-01  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/glib.def: Add g_string_chunk_insert_len.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fbb6f35a..ef656698 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-04-07  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0.
+	(#110087) 
+
 2003-04-01  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/glib.def: Add g_string_chunk_insert_len.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fbb6f35a..ef656698 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-04-07  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0.
+	(#110087) 
+
 2003-04-01  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/glib.def: Add g_string_chunk_insert_len.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fbb6f35a..ef656698 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-04-07  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0.
+	(#110087) 
+
 2003-04-01  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/glib.def: Add g_string_chunk_insert_len.
diff --git a/glib/gutf8.c b/glib/gutf8.c
index 9371bf12..07b9a966 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -202,7 +202,8 @@ g_utf8_prev_char (const gchar *p)
  * @p: pointer to the start of a UTF-8 encoded string.
  * @max: the maximum number of bytes to examine. If @max
  *       is less than 0, then the string is assumed to be
- *       nul-terminated.
+ *       nul-terminated. If @max is 0, @p will not be examined and 
+ *       may be %NULL.
  * 
  * Returns the length of the string in characters.
  *
@@ -214,6 +215,7 @@ g_utf8_strlen (const gchar *p,
 {
   glong len = 0;
   const gchar *start = p;
+  g_return_val_if_fail (p != NULL || max == 0, 0);
 
   if (max < 0)
     {