From: Richard Jones <rjones@redhat.com>
Date: Thu, 21 Jan 2010 17:07:42 +0000 (+0000)
Subject: hivex: Fix calculation of block size for vk data blocks.
X-Git-Tag: 1.0.82~3
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=64fa7b9db7bd8bd543c2afa413ffbcc488988eab

hivex: Fix calculation of block size for vk data blocks.
---

diff --git a/hivex/hivex.c b/hivex/hivex.c
index 81767ad..71d9c29 100644
--- a/hivex/hivex.c
+++ b/hivex/hivex.c
@@ -1187,7 +1187,7 @@ hivex_value_value (hive_h *h, hive_value_h value,
 
   /* Check that the declared size isn't larger than the block its in. */
   size_t blen = block_len (h, data_offset, NULL);
-  if (len > blen) {
+  if (len > blen - 4 /* subtract 4 for block header */) {
     if (h->msglvl >= 2)
       fprintf (stderr, "hivex_value_value: returning EFAULT because data is longer than its block (data 0x%zx, data len %zu, block len %zu)\n",
                data_offset, len, blen);