Fix 319806

diff --git a/ChangeLog b/ChangeLog
index 32b3188..f508052 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutf8.c (g_ucs4_to_utf8): Don't set items_read twice
+       in the error case, and add some documentation.  (#319806, Morten
+       Welinder)
+
 2005-10-19  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Use AC_CHECK_FUNCS for _NSGetEnviron, to get the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 32b3188..f508052 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-10-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutf8.c (g_ucs4_to_utf8): Don't set items_read twice
+       in the error case, and add some documentation.  (#319806, Morten
+       Welinder)
+
 2005-10-19  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Use AC_CHECK_FUNCS for _NSGetEnviron, to get the

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 32b3188..f508052 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-10-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gutf8.c (g_ucs4_to_utf8): Don't set items_read twice
+       in the error case, and add some documentation.  (#319806, Morten
+       Welinder)
+
 2005-10-19  Manish Singh  <yosh@gimp.org>
 
        * configure.in: Use AC_CHECK_FUNCS for _NSGetEnviron, to get the

diff --git a/glib/gutf8.c b/glib/gutf8.c
index dc87523..e139230 100644 (file)
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -958,7 +958,9 @@ g_utf8_to_ucs4 (const gchar *str,
  * Return value: a pointer to a newly allocated UTF-8 string.
  *               This value must be freed with g_free(). If an
  *               error occurs, %NULL will be returned and
- *               @error set.
+ *               @error set. In that case, @items_read will be
+ *               set to the position of the first invalid input 
+ *               character.
  **/
 gchar *
 g_ucs4_to_utf8 (const gunichar *str,
@@ -980,9 +982,6 @@ g_ucs4_to_utf8 (const gunichar *str,
 
       if (str[i] >= 0x80000000)
        {
-         if (items_read)
-           *items_read = i;
-         
          g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
                       _("Character out of range for UTF-8"));
          goto err_out;