* 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 c2dfcfc5815580f73a057d711b18dee0fa9d0a36..9b6a1c9b06248f199ab2efd4dd6398a57d8d8c37 100644 (file)
--- 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 02e95110114d87c9fe475062189d5a736bee8314..b14edafbeef2b3b366b64de34450375ed98cd88c 100644 (file)
--- 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);
            }
        }