diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2018-05-13 23:27:39 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2018-05-13 23:27:39 -0600 |
| commit | ae4bbcf4e8bb991ad3106ff0d7799276912c5815 (patch) | |
| tree | 9d97791fdc05afd560be33c9d46bfffaaa42739b /pith/send.c | |
| parent | aac7b10863bcfabe936feb5151e7e11123e13306 (diff) | |
| download | alpine-ae4bbcf4e8bb991ad3106ff0d7799276912c5815.tar.xz | |
* For a calendar entry with method PUBLISH, we show all entries in the calendar.
When "More Details" is selected for each individual event, the description
of that entry is shown only. When the calendar is opened from the view
attachment list screen, all entries will be shown. Mske sure there are no
memory leaks.
* Reverse some of the changes to make valgrind happy, as this may make Alpine crash
by using memory that was released.
Diffstat (limited to 'pith/send.c')
| -rw-r--r-- | pith/send.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pith/send.c b/pith/send.c index 8be908c2..460f6a24 100644 --- a/pith/send.c +++ b/pith/send.c @@ -1226,10 +1226,12 @@ pine_new_env(ENVELOPE *outgoing, char **fccp, char ***tobufpp, PINEFIELD *custom for(i=0; i < stdcnt; i++, pf++){ pf->name = cpystr(pf_template[i].name); - if(i == N_SENDER && F_ON(F_USE_SENDER_NOT_X, ps_global)) + if(i == N_SENDER && F_ON(F_USE_SENDER_NOT_X, ps_global)){ /* slide string over so it is Sender instead of X-X-Sender */ - for(p=pf->name; *(p+1); p++) - *p = *(p+4); + for(p=pf->name+4; *p != '\0'; p++) + *(p-4) = *p; + *(p-4) = '\0'; + } pf->type = pf_template[i].type; pf->canedit = pf_template[i].canedit; @@ -4279,7 +4281,6 @@ pine_rfc822_output_body(struct mail_bodystruct *body, soutr_t f, void *s) int add_trailing_crlf; LOC_2022_JP ljp; gf_io_t gc; - void *table = NULL; dprint((4, "-- pine_rfc822_output_body: %d\n", body ? body->type : 0)); @@ -4364,7 +4365,7 @@ pine_rfc822_output_body(struct mail_bodystruct *body, soutr_t f, void *s) gf_line_test_opt(translate_utf8_to_2022_jp,&ljp)); } else{ - table = utf8_rmap(charset); + void *table = utf8_rmap(charset); if(table){ gf_link_filter(gf_convert_utf8_charset, @@ -4411,9 +4412,6 @@ pine_rfc822_output_body(struct mail_bodystruct *body, soutr_t f, void *s) display_message('x'); } - if(table) - fs_give((void **)&table); - gf_clear_so_readc(bodyso); if(encode_error || !l_flush_net(TRUE)) |