From: Philippe De Muyter <phdm@macqel.be>
Date: Fri, 17 Mar 2000 10:19:22 +0000 (+0000)
Subject:        * language.c (set_lang_str): Do not call `free' for a null pointer.
X-Git-Tag: gdb_5_0-2000-04-10-branchpoint~251
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccdaf797f78b0ddf1f63fea1baef497066d1344f;p=platform%2Fupstream%2Fbinutils.git

   * 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 7aefcdf..14599a2 100644
--- 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 7370276..20d2adb 100644
--- 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);
 }