AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't corrupt memory when faced with paths with ridiculously large

Browse Source 
2007-01-08  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtktreemodel.c (gtk_tree_path_to_string): Don't
        corrupt memory when faced with paths with ridiculously
        large indices. Found by the GTKVTS test suite.



svn path=/trunk/; revision=17116
This commit is contained in:
Matthias Clasen 2007-01-08 14:49:30 +00:00 committed by Matthias Clasen
parent 74280fde6f
commit 32e1c3b4d2
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-01-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_path_to_string): Don't
corrupt memory when faced with paths with ridiculously
large indices. Found by the GTKVTS test suite.
2007-01-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmodules.c (_gtk_modules_init): Set

14
gtk/gtktreemodel.c
View File

@ -494,22 +494,24 @@ gtk_tree_path_new_from_indices (gint first_index,
gchar *
gtk_tree_path_to_string (GtkTreePath *path)
{
gchar *retval, *ptr;
gint i;
gchar *retval, *ptr, *end;
gint i, n;
g_return_val_if_fail (path != NULL, NULL);
if (path->depth == 0)
return NULL;
ptr = retval = g_new0 (gchar, path->depth*8);
g_sprintf (retval, "%d", path->indices[0]);
while (*ptr != '\000')
n = path->depth * 12;
ptr = retval = g_new0 (gchar, n);
end = ptr + n;
g_snprintf (retval, end - ptr, "%d", path->indices[0]);
while (*ptr != '\000')
ptr++;
for (i = 1; i < path->depth; i++)
{
g_sprintf (ptr, ":%d", path->indices[i]);
g_snprintf (ptr, end - ptr, ":%d", path->indices[i]);
while (*ptr != '\000')
ptr++;
}