diff options
author | Eduardo Chappa <chappa@washington.edu> | 2020-08-05 18:43:29 -0600 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2020-08-05 18:43:29 -0600 |
commit | 3d7933462d3e0017052cf23168e946453aa7bc4e (patch) | |
tree | 207029aa58f48c14fe7fc715a90b0b6227b4d15f | |
parent | e967596d91f79a6f34374fe4ee747a55792b5ffc (diff) | |
download | alpine-3d7933462d3e0017052cf23168e946453aa7bc4e.tar.xz |
* Crash when Alpine frees memory on a system where LC_CTYPE is not
configured, and the user calls the file browser to attach files to
a message. Reported by Luis Gerardo Tejero.
-rw-r--r-- | pith/charconv/utf8.c | 2 | ||||
-rw-r--r-- | pith/pine.hlp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pith/charconv/utf8.c b/pith/charconv/utf8.c index 2bb301c7..e1f16b3f 100644 --- a/pith/charconv/utf8.c +++ b/pith/charconv/utf8.c @@ -283,7 +283,7 @@ convert_to_utf8(char *str, char *fromcharset, int flags) } /* else no conversion necessary */ - if(result.data) + if(result.data && result.data != src.data) fs_give((void **) &result.data); result.size = 0; diff --git a/pith/pine.hlp b/pith/pine.hlp index 9177d488..48c1a4bd 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 499 2020-08-05 03:09:13 +Alpine Commit 500 2020-08-05 18:43:02 ============= h_news ================= <HTML> <HEAD> @@ -261,6 +261,10 @@ Bugs addressed: <LI> When Alpine opens a folder in a server whose address is given numerically it might crash due to an incorrect freeing of memory. Reported by Wang Kang. +<LI> Crash when Alpine frees memory on a system where LC_CTYPE is not + configured, and the user calls the file browser to attach files to + a message. Reported by Luis Gerardo Tejero. + <LI> Invalid signatures created by Alpine, when built with recent releases of the Openssl-1.1.1 series (but not in the Openssl-1.0.1 series). Fix contributed by Bernd Edlinger. |