From: Joel Brobecker <brobecker@gnat.com>
Date: Mon, 21 Dec 2009 04:56:43 +0000 (+0000)
Subject:         * completer.c (complete_line_internal): Make sure the command
X-Git-Tag: gdb_7_0_1-2009-12-22-release~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d3d10b03d4be543367cf1efd6c71fa95dccaa04;p=thirdparty%2Fbinutils-gdb.git

    * completer.c (complete_line_internal): Make sure the command
        completer is not NULL before calling it.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c2dfcfc5815..9b6a1c9b062 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-21  Joel Brobecker  <brobecker@adacore.com>
+
+	* completer.c (complete_line_internal): Make sure the command
+	completer is not NULL before calling it.
+
 2009-12-20  Michael Snyder  <msnyder@vmware.com>
 
 	* amd64-tdep.c (amd64_epilogue_frame_cache): Fix buf size.
diff --git a/gdb/completer.c b/gdb/completer.c
index 02e95110114..b14edafbeef 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -676,7 +676,7 @@ complete_line_internal (const char *text, char *line_buffer, int point,
 			   p--)
 			;
 		    }
-		  if (reason != handle_brkchars)
+		  if (reason != handle_brkchars && c->completer != NULL)
 		    list = (*c->completer) (c, p, word);
 		}
 	    }
@@ -747,7 +747,7 @@ complete_line_internal (const char *text, char *line_buffer, int point,
 		       p--)
 		    ;
 		}
-	      if (reason != handle_brkchars)
+	      if (reason != handle_brkchars && c->completer != NULL)
 		list = (*c->completer) (c, p, word);
 	    }
 	}