luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Guard against bogus return value from strxfrm(). For instance Microsoft's

Browse Source 
2004-08-21  Tor Lillqvist  <tml@iki.fi>

	* glib/gunicollate.c (g_utf8_collate_key): Guard against bogus
	return value from strxfrm(). For instance Microsoft's strxfrm()
	returns INT_MAX on errors. (#141124)
This commit is contained in:
Tor Lillqvist 2004-08-21 13:43:51 +00:00 committed by Tor Lillqvist
parent c61e425b91
commit e65caea220
6 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,9 @@
2004-08-21 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate_key): Guard against bogus
return value from strxfrm(). For instance Microsoft's strxfrm()
returns INT_MAX on errors. (#141124)
2004-08-19 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
@ -120,7 +126,7 @@ Sun Aug 1 13:19:18 2004 Manish Singh <yosh@gimp.org>
to run_roundtrip_tests().
2004-08-01 Matthias Clasen <mclasen@redhat.com>
* Post-release version bump
* === Released 2.5.1 ===

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2004-08-21 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate_key): Guard against bogus
return value from strxfrm(). For instance Microsoft's strxfrm()
returns INT_MAX on errors. (#141124)
2004-08-19 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
@ -120,7 +126,7 @@ Sun Aug 1 13:19:18 2004 Manish Singh <yosh@gimp.org>
to run_roundtrip_tests().
2004-08-01 Matthias Clasen <mclasen@redhat.com>
* Post-release version bump
* === Released 2.5.1 ===

8
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
2004-08-21 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate_key): Guard against bogus
return value from strxfrm(). For instance Microsoft's strxfrm()
returns INT_MAX on errors. (#141124)
2004-08-19 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
@ -120,7 +126,7 @@ Sun Aug 1 13:19:18 2004 Manish Singh <yosh@gimp.org>
to run_roundtrip_tests().
2004-08-01 Matthias Clasen <mclasen@redhat.com>
* Post-release version bump
* === Released 2.5.1 ===

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2004-08-21 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate_key): Guard against bogus
return value from strxfrm(). For instance Microsoft's strxfrm()
returns INT_MAX on errors. (#141124)
2004-08-19 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
@ -120,7 +126,7 @@ Sun Aug 1 13:19:18 2004 Manish Singh <yosh@gimp.org>
to run_roundtrip_tests().
2004-08-01 Matthias Clasen <mclasen@redhat.com>
* Post-release version bump
* === Released 2.5.1 ===

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2004-08-21 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate_key): Guard against bogus
return value from strxfrm(). For instance Microsoft's strxfrm()
returns INT_MAX on errors. (#141124)
2004-08-19 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
@ -120,7 +126,7 @@ Sun Aug 1 13:19:18 2004 Manish Singh <yosh@gimp.org>
to run_roundtrip_tests().
2004-08-01 Matthias Clasen <mclasen@redhat.com>
* Post-release version bump
* === Released 2.5.1 ===

8
glib/gunicollate.c
View File

@ -231,6 +231,14 @@ g_utf8_collate_key (const gchar *str,
if (str_locale)
{
xfrm_len = strxfrm (NULL, str_locale, 0);
if (xfrm_len < 0 || xfrm_len >= G_MAXINT - 2)
{
g_free (str_locale);
str_locale = NULL;
}
}
if (str_locale)
{
result = g_malloc (xfrm_len + 2);
result[0] = 'A';
strxfrm (result + 1, str_locale, xfrm_len + 1);