From f9ff4a203b8c155d51a208cadadb62f224fba715 Mon Sep 17 00:00:00 2001
From: Oliver Giles <ohw.giles@gmail.com>
Date: Mon, 1 Feb 2021 10:18:17 +1300
Subject: [PATCH] Ensure the size of the version field is 4 bytes

A corrupted version field size can cause TNEFVersion to access outside
of allocated memory. Check the version is the expected size and raise
an error if not.

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

diff --git a/lib/ytnef.c b/lib/ytnef.c
index b148719..ffede44 100644
--- a/lib/ytnef.c
+++ b/lib/ytnef.c
@@ -335,6 +335,10 @@ int TNEFRendData STD_ARGLIST {
 int TNEFVersion STD_ARGLIST {
   WORD major;
   WORD minor;
+  if (size != 2 * sizeof(WORD)) {
+    printf("Incorrect size of version field, suspected corruption\n");
+    return -1;
+  }
   minor = SwapWord((BYTE*)data, size);
   major = SwapWord((BYTE*)data + 2, size - 2);
 
tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=e45c3ac81441b0343a8d900d1aff3ad2f4de484e'>refs</a><a class='active' href='/guix/log/tests/guix-repl.sh'>log</a><a href='/guix/tree/tests/guix-repl.sh?id=e45c3ac81441b0343a8d900d1aff3ad2f4de484e'>tree</a><a href='/guix/commit/tests/guix-repl.sh?id=e45c3ac81441b0343a8d900d1aff3ad2f4de484e'>commit</a><a href='/guix/diff/tests/guix-repl.sh?id=e45c3ac81441b0343a8d900d1aff3ad2f4de484e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-repl.sh'>
<input type='hidden' name='id' value='e45c3ac81441b0343a8d900d1aff3ad2f4de484e'/><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=e45c3ac81441b0343a8d900d1aff3ad2f4de484e'>root</a>/<a href='/guix/log/tests?id=e45c3ac81441b0343a8d900d1aff3ad2f4de484e'>tests</a>/<a href='/guix/log/tests/guix-repl.sh?id=e45c3ac81441b0343a8d900d1aff3ad2f4de484e'>guix-repl.sh</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/tests/guix-repl.sh?id=e45c3ac81441b0343a8d900d1aff3ad2f4de484e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-09-16 16:04:01 +0200'>2020-09-16</span></td><td><a href='/guix/commit/tests/guix-repl.sh?id=d7f7ed39be3be926b3c46c0ea15d416c593ef61f'>repl: Look for script files in (getcwd).</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/43331&gt;.

* guix/scripts/repl.scm (guix-repl): Replace "." by (getcwd)
* tests/guix-repl.sh: Add test.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Konrad Hinsen</td></tr>
<tr><td><span title='2020-06-14 23:02:36 +0200'>2020-06-14</span></td><td><a href='/guix/commit/tests/guix-repl.sh?id=c924e541390f9595d819edc33c19d979917c15ec'>guix repl: Add script execution.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/repl.scm: Add filename options for script execution.
* doc/guix.texi (Invoking guix repl): Document it.
* tests/guix-repl.sh: Test it.
* Makefile.am: (SH_TESTS): Add it.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Konrad Hinsen</td></tr>