Ensure mutt_extract_token() never returns a NULL dest->data.

Commit e5a32a61 removed a 'mutt_buffer_addch (dest, 0)' at the end of
the function.  Most callers had been converted to use the buffer pool,
and the call was strange since buffers self-terminate.

However, this line covered up logic errors in some of the callers,
which assumed the buffer->data could not be NULL afterwards.

I will try to fix up callers with the logic errors in master.  This is
to fix the problem in stable, and also ensure future callers don't
make the same mistake.

1 files changed, 6 insertions, 0 deletions

diff --git a/init.c b/init.c
index b9c3951f..4e6ff9be 100644
--- a/init.c
+++ b/init.c
@@ -141,6 +141,12 @@ int mutt_extract_token (BUFFER *dest, BUFFER *tok, int flags)
   char		qc = 0; /* quote char */
   char		*pc;
 
+  /* Some callers used to rely on the (bad) assumption that dest->data
+   * would be non-NULL after calling this function.  Perhaps I've missed
+   * a few cases, or a future caller might make the same mistake.
+   */
+  if (!dest->data)
+    mutt_buffer_increase_size (dest, STRING);
   mutt_buffer_clear (dest);
 
   SKIPWS (tok->dptr);