diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2019-05-05 11:58:12 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2019-05-05 11:58:12 -0600 |
| commit | 6413ad3c988016cfee16aaf4b5d3e05d71c983d9 (patch) | |
| tree | e783ae9a622227434caddfc2f044aaed0ad55464 | |
| parent | c024a78dbaa9b42db7f18b0fea1894c41e2b0d67 (diff) | |
| download | alpine-6413ad3c988016cfee16aaf4b5d3e05d71c983d9.tar.xz | |
* Alpine stops parsing the mailcap file when it finds an invalid entry.
Reported by Matt Roberds to the Debian bug system at
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886370.
| -rw-r--r-- | pith/mailcap.c | 4 | ||||
| -rw-r--r-- | pith/pine.hlp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pith/mailcap.c b/pith/mailcap.c index 06a0b63..06f521f 100644 --- a/pith/mailcap.c +++ b/pith/mailcap.c @@ -277,8 +277,8 @@ mc_parse_file(char *file) { char *tokens[MC_TOKEN_MAX]; - while(mc_parse_line(&file, tokens)) - mc_build_entry(tokens); + while(file && *file) + if(mc_parse_line(&file, tokens)) mc_build_entry(tokens); } diff --git a/pith/pine.hlp b/pith/pine.hlp index af37f7a..a969958 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 336 2019-05-04 12:40:47 +Alpine Commit 337 2019-05-05 11:58:07 ============= h_news ================= <HTML> <HEAD> @@ -156,7 +156,7 @@ Version <!--#echo var="ALPINE_VERSION"--> (<!--#echo var="ALPINE_REVISION"-->) <!--chtml endif--> <BR> -<BR>Copyright 2013-2018 Eduardo Chappa +<BR>Copyright 2013-2019 Eduardo Chappa <BR>Copyright 2006-2008 University of Washington </DIV> @@ -323,6 +323,10 @@ Bugs that have been addressed include: <LI> Restore recognition of empty directories. It was deleted by mistake when added support for internationalization in folders. Based on a report by Michael Rutter. + + <LI> Alpine stops parsing the mailcap file when it finds an invalid entry. + Reported by Matt Roberds to the Debian bug system at + <A HREF="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886370">https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886370</A>. </UL> <P> |