summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--alpine/alpine.c2
-rw-r--r--pith/charconv/utf8.c4
-rw-r--r--pith/mailview.c3
-rw-r--r--pith/pine.hlp2
-rw-r--r--pith/state.c3
5 files changed, 12 insertions, 2 deletions
diff --git a/alpine/alpine.c b/alpine/alpine.c
index c9c9b37b..bbccb793 100644
--- a/alpine/alpine.c
+++ b/alpine/alpine.c
@@ -1193,6 +1193,8 @@ main(int argc, char **argv)
q_status_message1(SM_ORDER, 3, 4,
_("Unable to open folder \"%s\""), args.data.folder);
+ fs_give((void **) &args.data.folder);
+
goodnight_gracey(pine_state, -1);
}
}
diff --git a/pith/charconv/utf8.c b/pith/charconv/utf8.c
index b7d79d7b..373f4b62 100644
--- a/pith/charconv/utf8.c
+++ b/pith/charconv/utf8.c
@@ -280,6 +280,10 @@ convert_to_utf8(char *str, char *fromcharset, int flags)
}
/* else no conversion necessary */
+ if(result.data)
+ fs_give((void **) &result.data);
+ result.size = 0;
+
return(ret);
}
diff --git a/pith/mailview.c b/pith/mailview.c
index c438371c..a0aead24 100644
--- a/pith/mailview.c
+++ b/pith/mailview.c
@@ -609,12 +609,13 @@ format_body(long int msgno, BODY *body, HANDLE_S **handlesp, HEADER_S *hp, int f
&& body->nested.part->body.type == TYPETEXT)
charset = parameter_val(body->nested.part->body.parameter, "charset");
else
- charset = ps_global->display_charmap;
+ charset = cpystr(ps_global->display_charmap);
if(strucmp(charset, "us-ascii") && strucmp(charset, "utf-8")){
/* transliterate message text to UTF-8 */
gf_link_filter(gf_utf8, gf_utf8_opt(charset));
}
+ if (charset) fs_give((void **) &charset);
/* link in filters, similar to what is done in decode_text() */
if(!ps_global->pass_ctrl_chars){
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 637f2e31..a8cdb89a 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 286 2018-06-16 00:36:08
+Alpine Commit 287 2018-06-16 17:37:20
============= h_news =================
<HTML>
<HEAD>
diff --git a/pith/state.c b/pith/state.c
index f4785850..7b1cbdd7 100644
--- a/pith/state.c
+++ b/pith/state.c
@@ -117,6 +117,9 @@ free_pine_struct(struct pine **pps)
if(!(pps && (*pps)))
return;
+ if((*pps)->free_initial_cmds != NULL)
+ fs_give((void **) &(*pps)->free_initial_cmds);
+
if((*pps)->id != NULL)
mail_free_idlist(&(*pps)->id);