fix segfaults.

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

        * glib/gscanner.c: (g_scanner_unexp_token): fix segfaults.

diff --git a/ChangeLog b/ChangeLog
index 2e77eb0..9cc8d3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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'

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2e77eb0..9cc8d3d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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'

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2e77eb0..9cc8d3d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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'

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2e77eb0..9cc8d3d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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'

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2e77eb0..9cc8d3d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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'

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2e77eb0..9cc8d3d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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'

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2e77eb0..9cc8d3d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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'

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2e77eb0..9cc8d3d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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'

diff --git a/glib/gscanner.c b/glib/gscanner.c
index 09cfc7f..659137f 100644 (file)
--- 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)