From f2380a53fb84d370eaf6e6c3473062c54c57fac7 Mon Sep 17 00:00:00 2001
From: Oliver Giles <ohw.giles@gmail.com>
Date: Mon, 1 Feb 2021 10:12:16 +1300
Subject: [PATCH] Prevent potential double-free in TNEFSubjectHandler

If TNEFSubjectHandler is called multiple times, but the last time
failed due to the PREALLOCCHECK, the subject.data member will be
a freed, but invalid pointer. To prevent a double-free next time
TNEFSubjectHandler is entered, set it to zero after freeing.

Resolves: #85
Reported-by: jasperla
---
 lib/ytnef.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ytnef.c b/lib/ytnef.c
index b148719..b06c807 100644
--- a/lib/ytnef.c
+++ b/lib/ytnef.c
@@ -301,8 +301,10 @@ int TNEFFromHandler STD_ARGLIST {
 }
 // -----------------------------------------------------------------------------
 int TNEFSubjectHandler STD_ARGLIST {
-  if (TNEF->subject.data)
+  if (TNEF->subject.data) {
     free(TNEF->subject.data);
+    TNEF->subject.data = NULL;
+  }
 
   PREALLOCCHECK(size, 100);
   TNEF->subject.data = calloc(size+1, sizeof(BYTE));
d>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=6eab7ce6c004a7016951fd07aceede26926602d3'>refs</a><a class='active' href='/guix/log/gnu/packages/aux-files/linux-libre/6.1-i686.conf'>log</a><a href='/guix/tree/gnu/packages/aux-files/linux-libre/6.1-i686.conf?id=6eab7ce6c004a7016951fd07aceede26926602d3'>tree</a><a href='/guix/commit/gnu/packages/aux-files/linux-libre/6.1-i686.conf?id=6eab7ce6c004a7016951fd07aceede26926602d3'>commit</a><a href='/guix/diff/gnu/packages/aux-files/linux-libre/6.1-i686.conf?id=6eab7ce6c004a7016951fd07aceede26926602d3'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/aux-files/linux-libre/6.1-i686.conf'>
<input type='hidden' name='id' value='6eab7ce6c004a7016951fd07aceede26926602d3'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=6eab7ce6c004a7016951fd07aceede26926602d3'>root</a>/<a href='/guix/log/gnu?id=6eab7ce6c004a7016951fd07aceede26926602d3'>gnu</a>/<a href='/guix/log/gnu/packages?id=6eab7ce6c004a7016951fd07aceede26926602d3'>packages</a>/<a href='/guix/log/gnu/packages/aux-files?id=6eab7ce6c004a7016951fd07aceede26926602d3'>aux-files</a>/<a href='/guix/log/gnu/packages/aux-files/linux-libre?id=6eab7ce6c004a7016951fd07aceede26926602d3'>linux-libre</a>/<a href='/guix/log/gnu/packages/aux-files/linux-libre/6.1-i686.conf?id=6eab7ce6c004a7016951fd07aceede26926602d3'>6.1-i686.conf</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/aux-files/linux-libre/6.1-i686.conf?id=6eab7ce6c004a7016951fd07aceede26926602d3&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-02-19 01:00:01 +0100'>2023-02-19</span></td><td><a href='/guix/commit/gnu/packages/aux-files/linux-libre/6.1-i686.conf?id=e701f67246680c81dd111cf7136b936bf7d8718b'>gnu: linux-libre: Consistently provide the drop_monitor module.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is needed by, e.g., &lt;https://github.com/nhorman/dropwatch&gt;.
Build it as a module everywhere for consistency.

* gnu/packages/aux-files/linux-libre/4.14-i686.conf:
Set CONFIG_NET_DROP_MONITOR=m.
* gnu/packages/aux-files/linux-libre/4.14-x86_64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/4.19-i686.conf: Likewise.
* gnu/packages/aux-files/linux-libre/4.19-x86_64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.10-arm.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.10-arm64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.10-i686.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.10-x86_64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.15-arm.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.15-arm64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.15-i686.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.15-x86_64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.4-arm.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.4-arm64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.4-i686.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.4-x86_64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/6.1-arm.conf: Likewise.
* gnu/packages/aux-files/linux-libre/6.1-arm64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/6.1-i686.conf: Likewise.
* gnu/packages/aux-files/linux-libre/6.1-x86_64.conf: Likewise.

Reported by mirai in #guix.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-02-12 01:00:00 +0100'>2023-02-12</span></td><td><a href='/guix/commit/gnu/packages/aux-files/linux-libre/6.1-i686.conf?id=017f1779e937a85e525debdb89807592b35f55ea'>gnu: linux-libre: Disable unprivileged BPF by default.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/aux-files/linux-libre/5.15-arm.conf:
Set CONFIG_BPF_UNPRIV_DEFAULT_OFF=y.
* gnu/packages/aux-files/linux-libre/5.15-arm64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.15-i686.conf: Likewise.
* gnu/packages/aux-files/linux-libre/5.15-x86_64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/6.1-arm.conf: Likewise.
* gnu/packages/aux-files/linux-libre/6.1-arm64.conf: Likewise.
* gnu/packages/aux-files/linux-libre/6.1-i686.conf: Likewise.
* gnu/packages/aux-files/linux-libre/6.1-x86_64.conf: Likewise.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-01-03 12:07:46 -0500'>2023-01-03</span></td><td><a href='/guix/commit/gnu/packages/aux-files/linux-libre/6.1-i686.conf?id=cfce55bf4f232791f4341665a01c4cb873f0f60d'>gnu: Add linux-libre 6.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/linux.scm (linux-libre-6.1-version, linux-libre-6.1-gnu-revision,
deblob-scripts-6.1, linux-libre-6.1-source, linux-libre-headers-6.1,
linux-libre-6.1): New variables.
* gnu/packages/aux-files/linux-libre/6.1-arm.conf,
gnu/packages/aux-files/linux-libre/6.1-arm64.conf,
gnu/packages/aux-files/linux-libre/6.1-i686.conf,
gnu/packages/aux-files/linux-libre/6.1-x86_64.conf: New files.
* Makefile.am (AUX_FILES): Add them.
</span></span></td><td>Leo Famulari</td></tr>