fix segfaults.

2001-12-19  Mark McLoughlin  <mark@skynet.ie>

        * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
This commit is contained in:
Mark McLoughlin 2001-12-20 11:12:47 +00:00 committed by Mark McLoughlin
parent f53e8207b5
commit c5e8ac26e4
9 changed files with 34 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2001-12-19 Mark McLoughlin <mark@skynet.ie>
* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
2001-12-20 Michael Meeks <michael@ximian.com>
* glib/giounix.c (struct _GIOUnixWatch): kill 'callback'

View File

@ -1,3 +1,7 @@
2001-12-19 Mark McLoughlin <mark@skynet.ie>
* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
2001-12-20 Michael Meeks <michael@ximian.com>
* glib/giounix.c (struct _GIOUnixWatch): kill 'callback'

View File

@ -1,3 +1,7 @@
2001-12-19 Mark McLoughlin <mark@skynet.ie>
* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
2001-12-20 Michael Meeks <michael@ximian.com>
* glib/giounix.c (struct _GIOUnixWatch): kill 'callback'

View File

@ -1,3 +1,7 @@
2001-12-19 Mark McLoughlin <mark@skynet.ie>
* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
2001-12-20 Michael Meeks <michael@ximian.com>
* glib/giounix.c (struct _GIOUnixWatch): kill 'callback'

View File

@ -1,3 +1,7 @@
2001-12-19 Mark McLoughlin <mark@skynet.ie>
* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
2001-12-20 Michael Meeks <michael@ximian.com>
* glib/giounix.c (struct _GIOUnixWatch): kill 'callback'

View File

@ -1,3 +1,7 @@
2001-12-19 Mark McLoughlin <mark@skynet.ie>
* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
2001-12-20 Michael Meeks <michael@ximian.com>
* glib/giounix.c (struct _GIOUnixWatch): kill 'callback'

View File

@ -1,3 +1,7 @@
2001-12-19 Mark McLoughlin <mark@skynet.ie>
* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
2001-12-20 Michael Meeks <michael@ximian.com>
* glib/giounix.c (struct _GIOUnixWatch): kill 'callback'

View File

@ -1,3 +1,7 @@
2001-12-19 Mark McLoughlin <mark@skynet.ie>
* glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.
2001-12-20 Michael Meeks <michael@ximian.com>
* glib/giounix.c (struct _GIOUnixWatch): kill 'callback'

View File

@ -862,9 +862,9 @@ g_scanner_unexp_token (GScanner *scanner,
if ((scanner->token >= ' ' && scanner->token <= '~') ||
strchr (scanner->config->cset_identifier_first, scanner->token) ||
strchr (scanner->config->cset_identifier_nth, scanner->token))
g_snprintf (token_string, expected_string_len, "character `%c'", scanner->token);
g_snprintf (token_string, token_string_len, "character `%c'", scanner->token);
else
g_snprintf (token_string, expected_string_len, "character `\\%o'", scanner->token);
g_snprintf (token_string, token_string_len, "character `\\%o'", scanner->token);
break;
}
else if (!scanner->config->symbol_2_token)