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

Prevent an infinite loop when G_FILENAME_ENCODING is invalid. (#309280,

Browse Source 
2005-07-01  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilesel.c (cmpl_init_state): Prevent an infinite
	loop when G_FILENAME_ENCODING is invalid.  (#309280, Padraig Brady)
This commit is contained in:
Matthias Clasen 2005-07-01 15:51:30 +00:00 committed by Matthias Clasen
parent 1bf3ada15b
commit 7dc4d68410
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-07-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilesel.c (cmpl_init_state): Prevent an infinite
loop when G_FILENAME_ENCODING is invalid. (#309280, Padraig Brady)
Thu Jun 30 14:17:24 2005 Manish Singh <yosh@gimp.org> Thu Jun 30 14:17:24 2005 Manish Singh <yosh@gimp.org>
* gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event. * gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event.

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2005-07-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilesel.c (cmpl_init_state): Prevent an infinite
loop when G_FILENAME_ENCODING is invalid. (#309280, Padraig Brady)
Thu Jun 30 14:17:24 2005 Manish Singh <yosh@gimp.org> Thu Jun 30 14:17:24 2005 Manish Singh <yosh@gimp.org>
* gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event. * gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event.

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2005-07-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilesel.c (cmpl_init_state): Prevent an infinite
loop when G_FILENAME_ENCODING is invalid. (#309280, Padraig Brady)
Thu Jun 30 14:17:24 2005 Manish Singh <yosh@gimp.org> Thu Jun 30 14:17:24 2005 Manish Singh <yosh@gimp.org>
* gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event. * gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event.

6
gtk/gtkfilesel.c
View File

@ -2671,13 +2671,14 @@ cmpl_init_state (void)
{ {
gchar *utf8_cwd; gchar *utf8_cwd;
CompletionState *new_state; CompletionState *new_state;
gint tries = 0;
new_state = g_new (CompletionState, 1); new_state = g_new (CompletionState, 1);
utf8_cwd = get_current_dir_utf8 (); utf8_cwd = get_current_dir_utf8 ();
tryagain: tryagain:
tries++;
new_state->reference_dir = NULL; new_state->reference_dir = NULL;
new_state->completion_dir = NULL; new_state->completion_dir = NULL;
new_state->active_completion_dir = NULL; new_state->active_completion_dir = NULL;
@ -2697,7 +2698,8 @@ tryagain:
{ {
/* Directories changing from underneath us, grumble */ /* Directories changing from underneath us, grumble */
strcpy (utf8_cwd, G_DIR_SEPARATOR_S); strcpy (utf8_cwd, G_DIR_SEPARATOR_S);
goto tryagain; if (tries < 2)
goto tryagain;
} }
g_free (utf8_cwd); g_free (utf8_cwd);