summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2009-11-19 22:44:32 +0000
committerJoel Brobecker <brobecker@gnat.com>2009-11-19 22:44:32 +0000
commitecc21982887ab027bcf0c8ca5f5141b15d268d96 (patch)
treee2e1fdec392058f9e0041e95a6944c9f515a32e7
parentcbf7ffc19ba9cc028c2ecbe5877b8373276e82e3 (diff)
downloadgdb-ecc21982887ab027bcf0c8ca5f5141b15d268d96.tar.gz
* completer.c (complete_line_internal): Make sure the command
completer is not NULL before calling it.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/completer.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4f89bc9d78a..6ff3c3d5724 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-19 Joel Brobecker <brobecker@adacore.com>
+
+ * completer.c (complete_line_internal): Make sure the command
+ completer is not NULL before calling it.
+
2009-11-19 Jerome Guitton <guitton@adacore.com>
* ada-lang.c (packed_array_type): Rename to...
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);
}
}