• Bug#1105901: marked as done (unblock: neomutt/20250510+dfsg-2) (2/10)

    From Debian Bug Tracking System@21:1/5 to All on Sat May 24 19:00:01 2025
    [continued from previous message]

    +++ neomutt-20250510+dfsg/help.c 2025-05-10 06:17:14.000000000 -0300
    @@ -154,6 +154,7 @@
    struct BindingInfoArray bia_unbound = ARRAY_HEAD_INITIALIZER;
    struct Buffer *banner = NULL;
    struct Buffer *tempfile = NULL;
    + struct BindingInfo *bi = NULL;

    // ---------------------------------------------------------------------------
    // Gather the data
    @@ -201,7 +202,6 @@
    }

    const char *menu_name = mutt_map_get_name(menu, MenuNames);
    - struct BindingInfo *bi = NULL;

    fprintf(fp, "%s bindings\n", menu_name);
    fprintf(fp, "\n");
    @@ -271,6 +271,22 @@

    cleanup:

    + ARRAY_FOREACH(bi, &bia_bind)
    + {
    + FREE(&bi->a[0]);
    + }
    +
    + ARRAY_FOREACH(bi, &bia_macro)
    + {
    + FREE(&bi->a[0]);
    + FREE(&bi->a[1]);
    + }
    +
    + ARRAY_FOREACH(bi, &bia_gen)
    + {
    + FREE(&bi->a[0]);
    + }
    +
    buf_pool_release(&banner);
    buf_pool_release(&tempfile);
    ARRAY_FREE(&bia_bind);
    diff -Nru neomutt-20250404+dfsg/imap/imap.c neomutt-20250510+dfsg/imap/imap.c --- neomutt-20250404+dfsg/imap/imap.c 2025-04-04 06:48:33.000000000 -0300
    +++ neomutt-20250510+dfsg/imap/imap.c 2025-05-10 06:17:14.000000000 -0300
    @@ -1481,6 +1481,8 @@

    struct ImapAccountData *adata = imap_adata_get(m);
    struct ImapMboxData *mdata = imap_mdata_get(m);
    + if (!adata || !mdata)
    + return MX_STATUS_ERROR;

    if (adata->state < IMAP_SELECTED)
    {
    diff -Nru neomutt-20250404+dfsg/.mailmap neomutt-20250510+dfsg/.mailmap
    --- neomutt-20250404+dfsg/.mailmap 2025-04-04 06:48:33.000000000 -0300
    +++ neomutt-20250510+dfsg/.mailmap 2025-05-10 06:17:14.000000000 -0300
    @@ -209,8 +209,10 @@
    Joshua Jordi (@jakkinstewart) <[email protected]> Joshua Jordi <[email protected]>
    Joshua Jordi (@jakkinstewart) <[email protected]> Joshua Jordi <[email protected]>
    Julian Andres Klode (@julian-klode) <[email protected]> Julian Andres Klode <[email protected]>
    +Juris Lambda (@jxlambda) <[email protected]> Juris Lambda <[email protected]>
    Justin Vasel (@justinvasel)