make sure that scanner->config->cset_skip_characters is "" instead of

Wed Apr 19 08:32:32 2000  Tim Janik  <timj@gtk.org>

        * gscanner.c (g_scanner_new): make sure that
        scanner->config->cset_skip_characters is "" instead of NULL, so we
        don't segfault further on.

diff --git a/ChangeLog b/ChangeLog
index e1a0e7acbcc30e27baad9d3149317b87998f402a..e3dfb8b4422e16ec932fb2b5856a2c7f47105b46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr 19 08:32:32 2000  Tim Janik  <timj@gtk.org>
+
+        * 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-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h, glist.h, gslist.h: Changed the 'data' parameters from

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e1a0e7acbcc30e27baad9d3149317b87998f402a..e3dfb8b4422e16ec932fb2b5856a2c7f47105b46 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Apr 19 08:32:32 2000  Tim Janik  <timj@gtk.org>
+
+        * 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-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h, glist.h, gslist.h: Changed the 'data' parameters from

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e1a0e7acbcc30e27baad9d3149317b87998f402a..e3dfb8b4422e16ec932fb2b5856a2c7f47105b46 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Apr 19 08:32:32 2000  Tim Janik  <timj@gtk.org>
+
+        * 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-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h, glist.h, gslist.h: Changed the 'data' parameters from

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index e1a0e7acbcc30e27baad9d3149317b87998f402a..e3dfb8b4422e16ec932fb2b5856a2c7f47105b46 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Wed Apr 19 08:32:32 2000  Tim Janik  <timj@gtk.org>
+
+        * 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-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h, glist.h, gslist.h: Changed the 'data' parameters from

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e1a0e7acbcc30e27baad9d3149317b87998f402a..e3dfb8b4422e16ec932fb2b5856a2c7f47105b46 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Apr 19 08:32:32 2000  Tim Janik  <timj@gtk.org>
+
+        * 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-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h, glist.h, gslist.h: Changed the 'data' parameters from

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e1a0e7acbcc30e27baad9d3149317b87998f402a..e3dfb8b4422e16ec932fb2b5856a2c7f47105b46 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Apr 19 08:32:32 2000  Tim Janik  <timj@gtk.org>
+
+        * 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-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h, glist.h, gslist.h: Changed the 'data' parameters from

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e1a0e7acbcc30e27baad9d3149317b87998f402a..e3dfb8b4422e16ec932fb2b5856a2c7f47105b46 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Apr 19 08:32:32 2000  Tim Janik  <timj@gtk.org>
+
+        * 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-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h, glist.h, gslist.h: Changed the 'data' parameters from

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e1a0e7acbcc30e27baad9d3149317b87998f402a..e3dfb8b4422e16ec932fb2b5856a2c7f47105b46 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Apr 19 08:32:32 2000  Tim Janik  <timj@gtk.org>
+
+        * 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-18  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib.h, glist.h, gslist.h: Changed the 'data' parameters from

diff --git a/glib/gscanner.c b/glib/gscanner.c
index fdbdbf278e3579613e6d6194f6a26688186a0f6f..bbcbc7fd8decf3a880f9934462ac3cdaa372601b 100644 (file)
--- 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 fdbdbf278e3579613e6d6194f6a26688186a0f6f..bbcbc7fd8decf3a880f9934462ac3cdaa372601b 100644 (file)
--- 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;