~kevin8t8/mutt

cb9c683d474da195efee2b6b241dd78e639f167b — Kevin McCarthy a month ago cd3b529 + f6fb5a1
Merge branch 'stable'
4 files changed, 10 insertions(+), 8 deletions(-)

M buffer.c
M init.c
M pattern.c
M score.c
M buffer.c => buffer.c +1 -1
@@ 269,7 269,7 @@ void mutt_buffer_pool_release (BUFFER **pbuf)
  }

  buf = *pbuf;
  if (buf->dsize > LONG_STRING*2)
  if ((buf->dsize > LONG_STRING*2) || (buf->dsize < LONG_STRING))
  {
    buf->dsize = LONG_STRING;
    safe_realloc (&buf->data, buf->dsize);

M init.c => init.c +2 -5
@@ 1703,9 1703,7 @@ static int parse_my_hdr (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUF
      if (ascii_strncasecmp (buf->data, tmp->data, keylen) == 0)
      {
	/* replace the old value */
	FREE (&tmp->data);
	tmp->data = buf->data;
	mutt_buffer_init (buf);
	mutt_str_replace (&tmp->data, mutt_b2s (buf));
	return 0;
      }
      if (!tmp->next)


@@ 1719,8 1717,7 @@ static int parse_my_hdr (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUF
    tmp = mutt_new_list ();
    UserHeader = tmp;
  }
  tmp->data = buf->data;
  mutt_buffer_init (buf);
  tmp->data = safe_strdup (mutt_b2s (buf));
  return 0;
}


M pattern.c => pattern.c +6 -0
@@ 966,6 966,12 @@ pattern_t *mutt_pattern_comp (/* const */ char *s, int flags, BUFFER *err)
  char *buf;
  BUFFER ps;

  if (!s || !*s)
  {
    strfcpy (err->data, _("empty pattern"), err->dsize);
    return NULL;
  }

  mutt_buffer_init (&ps);
  ps.dptr = s;
  ps.dsize = mutt_strlen (s);

M score.c => score.c +1 -2
@@ 76,8 76,7 @@ int mutt_parse_score (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER
    strfcpy (err->data, _("score: too few arguments"), err->dsize);
    return (-1);
  }
  pattern = buf->data;
  mutt_buffer_init (buf);
  pattern = safe_strdup (mutt_b2s (buf));
  mutt_extract_token (buf, s, 0);
  if (MoreArgs (s))
  {