* language.c (set_lang_str): Do not call `free' for a null pointer.

         (set_type_str, set_range_str): Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7aefcdf56a7572fa1d63aba275769fd87c38053c..14599a2255358415272ffa72508630a45cf899fd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 17 11:06:59 2000  Philippe De Muyter  <phdm@macqel.be>
+
+       * language.c (set_lang_str): Do not call `free' for a null pointer.
+        (set_type_str, set_range_str): Ditto.
+
 2000-03-16  Jim Blandy  <jimb@redhat.com>
 
         * i386-linux-nat.c (i386_linux_saved_pc_after_call): Lost in the

diff --git a/gdb/language.c b/gdb/language.c
index 7370276f3be23badb22b71cec515b8f0b8061688..20d2adb66c022543e4e8174dd48e9dee5a62be91 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -394,7 +394,8 @@ set_lang_str ()
 {
   char *prefix = "";
 
-  free (language);
+  if (language)
+    free (language);
   if (language_mode == language_mode_auto)
     prefix = "auto; currently ";
 
@@ -406,7 +407,8 @@ set_type_str ()
 {
   char *tmp = NULL, *prefix = "";
 
-  free (type);
+  if (type)
+    free (type);
   if (type_mode == type_mode_auto)
     prefix = "auto; currently ";
 
@@ -451,7 +453,8 @@ set_range_str ()
       error ("Unrecognized range check setting.");
     }
 
-  free (range);
+  if (range)
+    free (range);
   range = concat (pref, tmp, NULL);
 }