From e01d746cba99b7b7187eb73fb6e8d02f0c67d0d8 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Wed, 19 Apr 2000 06:37:29 +0000 Subject: [PATCH] make sure that scanner->config->cset_skip_characters is "" instead of Wed Apr 19 08:32:32 2000 Tim Janik * gscanner.c (g_scanner_new): make sure that scanner->config->cset_skip_characters is "" instead of NULL, so we don't segfault further on. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ glib/gscanner.c | 2 ++ gscanner.c | 2 ++ 10 files changed, 60 insertions(+) diff --git a/ChangeLog b/ChangeLog index b19664888..988a1364e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ +Wed Apr 19 08:32:32 2000 Tim Janik + + * gscanner.c (g_scanner_new): make sure that + scanner->config->cset_skip_characters is "" instead of NULL, so we + don't segfault further on. + 2000-04-10 Elliot Lee + * gstrfuncs.c: A stringified double can be longer than 32 chars - fix space calculation routine to 'double' the max amount of space a double & long double can take. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b19664888..988a1364e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,4 +1,11 @@ +Wed Apr 19 08:32:32 2000 Tim Janik + + * gscanner.c (g_scanner_new): make sure that + scanner->config->cset_skip_characters is "" instead of NULL, so we + don't segfault further on. + 2000-04-10 Elliot Lee + * gstrfuncs.c: A stringified double can be longer than 32 chars - fix space calculation routine to 'double' the max amount of space a double & long double can take. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b19664888..988a1364e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,4 +1,11 @@ +Wed Apr 19 08:32:32 2000 Tim Janik + + * gscanner.c (g_scanner_new): make sure that + scanner->config->cset_skip_characters is "" instead of NULL, so we + don't segfault further on. + 2000-04-10 Elliot Lee + * gstrfuncs.c: A stringified double can be longer than 32 chars - fix space calculation routine to 'double' the max amount of space a double & long double can take. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b19664888..988a1364e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,4 +1,11 @@ +Wed Apr 19 08:32:32 2000 Tim Janik + + * gscanner.c (g_scanner_new): make sure that + scanner->config->cset_skip_characters is "" instead of NULL, so we + don't segfault further on. + 2000-04-10 Elliot Lee + * gstrfuncs.c: A stringified double can be longer than 32 chars - fix space calculation routine to 'double' the max amount of space a double & long double can take. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b19664888..988a1364e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,4 +1,11 @@ +Wed Apr 19 08:32:32 2000 Tim Janik + + * gscanner.c (g_scanner_new): make sure that + scanner->config->cset_skip_characters is "" instead of NULL, so we + don't segfault further on. + 2000-04-10 Elliot Lee + * gstrfuncs.c: A stringified double can be longer than 32 chars - fix space calculation routine to 'double' the max amount of space a double & long double can take. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b19664888..988a1364e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,4 +1,11 @@ +Wed Apr 19 08:32:32 2000 Tim Janik + + * gscanner.c (g_scanner_new): make sure that + scanner->config->cset_skip_characters is "" instead of NULL, so we + don't segfault further on. + 2000-04-10 Elliot Lee + * gstrfuncs.c: A stringified double can be longer than 32 chars - fix space calculation routine to 'double' the max amount of space a double & long double can take. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b19664888..988a1364e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,4 +1,11 @@ +Wed Apr 19 08:32:32 2000 Tim Janik + + * gscanner.c (g_scanner_new): make sure that + scanner->config->cset_skip_characters is "" instead of NULL, so we + don't segfault further on. + 2000-04-10 Elliot Lee + * gstrfuncs.c: A stringified double can be longer than 32 chars - fix space calculation routine to 'double' the max amount of space a double & long double can take. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b19664888..988a1364e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,4 +1,11 @@ +Wed Apr 19 08:32:32 2000 Tim Janik + + * gscanner.c (g_scanner_new): make sure that + scanner->config->cset_skip_characters is "" instead of NULL, so we + don't segfault further on. + 2000-04-10 Elliot Lee + * gstrfuncs.c: A stringified double can be longer than 32 chars - fix space calculation routine to 'double' the max amount of space a double & long double can take. diff --git a/glib/gscanner.c b/glib/gscanner.c index 61dfc41ef..362f41632 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -189,6 +189,8 @@ g_scanner_new (GScannerConfig *config_templ) scanner->config->case_sensitive = config_templ->case_sensitive; scanner->config->cset_skip_characters = config_templ->cset_skip_characters; + if (!scanner->config->cset_skip_characters) + scanner->config->cset_skip_characters = ""; scanner->config->cset_identifier_first= config_templ->cset_identifier_first; scanner->config->cset_identifier_nth = config_templ->cset_identifier_nth; scanner->config->cpair_comment_single = config_templ->cpair_comment_single; diff --git a/gscanner.c b/gscanner.c index 61dfc41ef..362f41632 100644 --- a/gscanner.c +++ b/gscanner.c @@ -189,6 +189,8 @@ g_scanner_new (GScannerConfig *config_templ) scanner->config->case_sensitive = config_templ->case_sensitive; scanner->config->cset_skip_characters = config_templ->cset_skip_characters; + if (!scanner->config->cset_skip_characters) + scanner->config->cset_skip_characters = ""; scanner->config->cset_identifier_first= config_templ->cset_identifier_first; scanner->config->cset_identifier_nth = config_templ->cset_identifier_nth; scanner->config->cpair_comment_single = config_templ->cpair_comment_single;