From 048002c8f74d8779f24085edcb790ee71cc93329 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 6 Apr 2003 22:16:59 +0000 Subject: [PATCH] Warn if p == NULL && max != 0. (#110087) 2003-04-07 Matthias Clasen * glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0. (#110087) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gutf8.c | 4 +++- 7 files changed, 33 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fbb6f35a7..ef656698e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-07 Matthias Clasen + + * glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0. + (#110087) + 2003-04-01 Tor Lillqvist * glib/glib.def: Add g_string_chunk_insert_len. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fbb6f35a7..ef656698e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2003-04-07 Matthias Clasen + + * glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0. + (#110087) + 2003-04-01 Tor Lillqvist * glib/glib.def: Add g_string_chunk_insert_len. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index fbb6f35a7..ef656698e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2003-04-07 Matthias Clasen + + * glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0. + (#110087) + 2003-04-01 Tor Lillqvist * glib/glib.def: Add g_string_chunk_insert_len. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fbb6f35a7..ef656698e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2003-04-07 Matthias Clasen + + * glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0. + (#110087) + 2003-04-01 Tor Lillqvist * glib/glib.def: Add g_string_chunk_insert_len. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fbb6f35a7..ef656698e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2003-04-07 Matthias Clasen + + * glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0. + (#110087) + 2003-04-01 Tor Lillqvist * glib/glib.def: Add g_string_chunk_insert_len. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fbb6f35a7..ef656698e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2003-04-07 Matthias Clasen + + * glib/gutf8.c (g_utf8_strlen): Warn if p == NULL && max != 0. + (#110087) + 2003-04-01 Tor Lillqvist * glib/glib.def: Add g_string_chunk_insert_len. diff --git a/glib/gutf8.c b/glib/gutf8.c index 9371bf120..07b9a9662 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) {