From c5e8ac26e4ecd4a8bb011d5aa7d8e9e8f378c046 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 20 Dec 2001 11:12:47 +0000 Subject: [PATCH] fix segfaults. 2001-12-19 Mark McLoughlin * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ glib/gscanner.c | 4 ++-- 9 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e77eb0..9cc8d3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-12-19 Mark McLoughlin + + * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults. + 2001-12-20 Michael Meeks * glib/giounix.c (struct _GIOUnixWatch): kill 'callback' diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2e77eb0..9cc8d3d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +2001-12-19 Mark McLoughlin + + * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults. + 2001-12-20 Michael Meeks * glib/giounix.c (struct _GIOUnixWatch): kill 'callback' diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2e77eb0..9cc8d3d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2001-12-19 Mark McLoughlin + + * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults. + 2001-12-20 Michael Meeks * glib/giounix.c (struct _GIOUnixWatch): kill 'callback' diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2e77eb0..9cc8d3d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2001-12-19 Mark McLoughlin + + * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults. + 2001-12-20 Michael Meeks * glib/giounix.c (struct _GIOUnixWatch): kill 'callback' diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2e77eb0..9cc8d3d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2001-12-19 Mark McLoughlin + + * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults. + 2001-12-20 Michael Meeks * glib/giounix.c (struct _GIOUnixWatch): kill 'callback' diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2e77eb0..9cc8d3d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2001-12-19 Mark McLoughlin + + * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults. + 2001-12-20 Michael Meeks * glib/giounix.c (struct _GIOUnixWatch): kill 'callback' diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2e77eb0..9cc8d3d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2001-12-19 Mark McLoughlin + + * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults. + 2001-12-20 Michael Meeks * glib/giounix.c (struct _GIOUnixWatch): kill 'callback' diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2e77eb0..9cc8d3d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2001-12-19 Mark McLoughlin + + * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults. + 2001-12-20 Michael Meeks * glib/giounix.c (struct _GIOUnixWatch): kill 'callback' diff --git a/glib/gscanner.c b/glib/gscanner.c index 09cfc7f..659137f 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -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) -- 2.7.4