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));
'/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=ae8096acd8b41269903d6a984a56a8faa7bf1179'>refs</a><a class='active' href='/guix/log/gnu/tests/data?showmsg=1'>log</a><a href='/guix/tree/gnu/tests/data?id=ae8096acd8b41269903d6a984a56a8faa7bf1179'>tree</a><a href='/guix/commit/gnu/tests/data?id=ae8096acd8b41269903d6a984a56a8faa7bf1179'>commit</a><a href='/guix/diff/gnu/tests/data?id=ae8096acd8b41269903d6a984a56a8faa7bf1179'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/data'>
<input type='hidden' name='id' value='ae8096acd8b41269903d6a984a56a8faa7bf1179'/><input type='hidden' name='showmsg' value='1'/><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=ae8096acd8b41269903d6a984a56a8faa7bf1179&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=ae8096acd8b41269903d6a984a56a8faa7bf1179&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/tests?id=ae8096acd8b41269903d6a984a56a8faa7bf1179&amp;showmsg=1'>tests</a>/<a href='/guix/log/gnu/tests/data?id=ae8096acd8b41269903d6a984a56a8faa7bf1179&amp;showmsg=1'>data</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/tests/data?id=ae8096acd8b41269903d6a984a56a8faa7bf1179'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2021-08-02 17:23:30 -0400'>2021-08-02</span></td><td class='logsubject'><a href='/guix/commit/gnu/tests/data?id=10f554700c417b84c22c56fdd007567a52c45d75'>Reinstate "services: Add a service for Jami."</a></td><td>Maxim Cournoyer</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This reverts commit 4673f817938d9d2b1b40a072ab2e0c44a32ccc97, which reverted
commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b with the fix detailed below.

Thanks to Christopher Baines for reporting the failure and proposing a fix.

* guix/self.scm (compiled-guix) [*system-test-modules*]: Add the test data
files via the 'extra-files' argument.
* gnu/local.mk (dist_patch_DATA): Move the tests/data/jami-dummy-account.dat
file to...
* gnu/local.mk (MODULES_NOT_COMPILED): ... here.


</td></tr>
<tr class='logheader'><td><span title='2021-08-02 15:48:59 -0400'>2021-08-02</span></td><td class='logsubject'><a href='/guix/commit/gnu/tests/data?id=4673f817938d9d2b1b40a072ab2e0c44a32ccc97'>Revert "services: Add a service for Jami."</a></td><td>Maxim Cournoyer</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This reverts commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b.  It broke 'guix
pull'.


</td></tr>
<tr class='logheader'><td><span title='2021-08-02 15:15:02 -0400'>2021-08-02</span></td><td class='logsubject'><a href='/guix/commit/gnu/tests/data?id=69dcc24c9f0cdfea674eb690e7755d26a25ced2b'>services: Add a service for Jami.</a></td><td>Maxim Cournoyer</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/services/telephony.scm (string-or-computed-file?)
(string-list?, account-fingerprint-list?): New procedures.
(maybe-string-list, maybe-account-fingerprint-list)
(maybe-boolean, maybe-string, jami-account-list): New configuration field
types.
(serialize-string-list, serialize-boolean, serialize-string)
(jami-account, jami-account-&gt;alist, jami-configuration)
(jami-account-list?, jami-account-list-maybe): New procedures.
(%jami-accounts): New variable.
(jami-configuration-&gt;command-line-arguments): New procedure.
(jami-dbus-session-activation, jami-shepherd-services): New procedures.
(jami-service-type): New variable.
* gnu/build/jami-service.scm: New file.
* gnu/tests/data/jami-dummy-account.dat: Likewise.
* gnu/tests/telephony.scm: Likewise.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register them.
* Makefile.am (SCM_TESTS): Register the test file.
(dist_patch_DATA): Register the new data file.
* doc/guix.texi (Telephony Services): Document it.


</td></tr>