changeset: 6386:59c2c4be08a7 user: Kevin McCarthy <ke...@8t8.us> date: Tue Jan 06 14:31:48 2015 -0800 link: http://dev.mutt.org/hg/mutt/rev/59c2c4be08a7
merge stable changeset: 6387:8a981dce369e user: Kevin McCarthy <ke...@8t8.us> date: Sun Dec 28 09:41:09 2014 -0800 link: http://dev.mutt.org/hg/mutt/rev/8a981dce369e Remove duplicate SmimeCryptAlg declaration in globals.h Thank you Elias Diem for the patch. changeset: 6388:c7f116b6dc20 user: Kevin McCarthy <ke...@8t8.us> date: Thu Aug 14 20:12:28 2014 -0700 link: http://dev.mutt.org/hg/mutt/rev/c7f116b6dc20 Fix variable name in configure.ac. $ac_cv_search_STRINGPREP_CHECK_VERSION should be $ac_cv_search_stringprep_check_version, to match the first parameter of the AC_SEARCH_LIBS([stringprep_check_version] above. Running configure was giving a "test: =: unary operator expected" error. changeset: 6389:e7a77a6bfb84 user: Kevin McCarthy <ke...@8t8.us> date: Fri Oct 10 14:17:09 2014 +0800 link: http://dev.mutt.org/hg/mutt/rev/e7a77a6bfb84 Fix a memory leak in mutt_query_complete. When a single result was returned, it was written to the buffer and returned, but the query result was never freed. This patch creates a free_query function and changes the code to use that everywhere. changeset: 6390:31ce789af3df user: Kevin McCarthy <ke...@8t8.us> date: Wed Dec 31 20:35:38 2014 -0800 link: http://dev.mutt.org/hg/mutt/rev/31ce789af3df Fix segfault of extract-keys (^K) under gpgme. (closes #3698) This patch is based on the patch by Ben Price, which relocated the safe_fclose (&in) after its use by keydata in pgp_gpgme_extract_keys. Thank you for the patch! In addition, this patch: * removes spurious (debug?) output when the extract keys is finished. * adds a gpgme_data_release() call to free the keydata. changeset: 6391:cd57f8893b43 user: Kevin McCarthy <ke...@8t8.us> date: Tue Jan 06 14:38:27 2015 -0800 link: http://dev.mutt.org/hg/mutt/rev/cd57f8893b43 merge stable diffs (38 lines): diff -r 79ea10b2d81c -r cd57f8893b43 pgpkey.c --- a/pgpkey.c Sat Jan 03 11:33:10 2015 -0800 +++ b/pgpkey.c Tue Jan 06 14:38:27 2015 -0800 @@ -985,13 +985,13 @@ pgp_remove_key (&matches, k); pgp_free_key (&matches); - if (!p[l-1]) + if (l && !p[l-1]) p[l-1] = '!'; return k; } out: - if (!p[l-1]) + if (l && !p[l-1]) p[l-1] = '!'; return NULL; } diff -r 79ea10b2d81c -r cd57f8893b43 sendlib.c --- a/sendlib.c Sat Jan 03 11:33:10 2015 -0800 +++ b/sendlib.c Tue Jan 06 14:38:27 2015 -0800 @@ -1814,7 +1814,14 @@ { tagbuf = mutt_substrdup (start, t); /* skip over the colon separating the header field name and value */ - t = skip_email_wsp(t + 1); + ++t; + + /* skip over any leading whitespace (WSP, as defined in RFC5322) + * NOTE: skip_email_wsp() does the wrong thing here. + * See tickets 3609 and 3716. */ + while (*t == ' ' || *t == '\t') + t++; + valbuf = mutt_substrdup (t, end); } dprint(4,(debugfile,"mwoh: buf[%s%s] too long, "