X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2Fhivex.c;h=7715520a3dc560abb99565dcaa40e1bcfb8ee09e;hb=107fb672a316d99980efbabcc50142306fb34003;hp=c65f6de7153c6d6e771a86b7547be46ede6ded50;hpb=77d38592f59f146c5ef249a3f7036cf2a1e45acd;p=hivex.git

diff --git a/lib/hivex.c b/lib/hivex.c
index c65f6de..7715520 100644
--- a/lib/hivex.c
+++ b/lib/hivex.c
@@ -1,5 +1,5 @@
 /* hivex - Windows Registry "hive" extraction library.
- * Copyright (C) 2009-2010 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  * Derived from code by Petter Nordahl-Hagen under a compatible license:
  *   Copyright (c) 1997-2007 Petter Nordahl-Hagen.
  * Derived from code by Markus Stephany under a compatible license:
@@ -62,6 +62,7 @@
 #define HIVEX_MAX_ALLOCATION  1000000
 
 static char *windows_utf16_to_utf8 (/* const */ char *input, size_t len);
+static size_t utf16_string_len_in_bytes_max (const char *str, size_t len);
 
 struct hive_h {
   char *filename;
@@ -413,7 +414,8 @@ hivex_open (const char *filename, int flags)
         page->magic[1] != 'b' ||
         page->magic[2] != 'i' ||
         page->magic[3] != 'n') {
-      fprintf (stderr, "hivex: %s: trailing garbage at end of file (at 0x%zx, after %zu pages)\n",
+      fprintf (stderr, "hivex: %s: trailing garbage at end of file "
+               "(at 0x%zx, after %zu pages)\n",
                filename, off, pages);
       errno = ENOTSUP;
       goto error;
@@ -451,7 +453,8 @@ hivex_open (const char *filename, int flags)
       int used;
       seg_len = block_len (h, blkoff, &used);
       if (seg_len <= 4 || (seg_len & 3) != 0) {
-        fprintf (stderr, "hivex: %s: block size %" PRIu32 " at 0x%zx, bad registry\n",
+        fprintf (stderr, "hivex: %s: block size %" PRIu32 " at 0x%zx,"
+                 " bad registry\n",
                  filename, le32toh (block->seg_len), blkoff);
         errno = ENOTSUP;
         goto error;
@@ -532,6 +535,9 @@ hivex_close (hive_h *h)
 {
   int r;
 
+  if (h->msglvl >= 1)
+    fprintf (stderr, "hivex_close\n");
+
   free (h->bitmap);
   if (!h->writable)
     munmap (h->addr, h->size);
@@ -581,7 +587,8 @@ hivex_node_name (hive_h *h, hive_node_h node)
   size_t seg_len = block_len (h, node, NULL);
   if (sizeof (struct ntreg_nk_record) + len - 1 > seg_len) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_node_name: returning EFAULT because node name is too long (%zu, %zu)\n",
+      fprintf (stderr, "hivex_node_name: returning EFAULT because node name"
+               " is too long (%zu, %zu)\n",
               len, seg_len);
     errno = EFAULT;
     return NULL;
@@ -728,7 +735,8 @@ get_children (hive_h *h, hive_node_h node,
   /* Arbitrarily limit the number of subkeys we will ever deal with. */
   if (nr_subkeys_in_nk > HIVEX_MAX_SUBKEYS) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex: get_children: returning ERANGE because nr_subkeys_in_nk > HIVEX_MAX_SUBKEYS (%zu > %d)\n",
+      fprintf (stderr, "hivex: get_children: returning ERANGE because "
+               "nr_subkeys_in_nk > HIVEX_MAX_SUBKEYS (%zu > %d)\n",
                nr_subkeys_in_nk, HIVEX_MAX_SUBKEYS);
     errno = ERANGE;
     goto error;
@@ -746,7 +754,8 @@ get_children (hive_h *h, hive_node_h node,
   subkey_lf += 0x1000;
   if (!IS_VALID_BLOCK (h, subkey_lf)) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_node_children: returning EFAULT because subkey_lf is not a valid block (0x%zx)\n",
+      fprintf (stderr, "hivex_node_children: returning EFAULT"
+               " because subkey_lf is not a valid block (0x%zx)\n",
                subkey_lf);
     errno = EFAULT;
     goto error;
@@ -770,7 +779,8 @@ get_children (hive_h *h, hive_node_h node,
     size_t nr_subkeys_in_lf = le16toh (lf->nr_keys);
 
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_node_children: nr_subkeys_in_nk = %zu, nr_subkeys_in_lf = %zu\n",
+      fprintf (stderr, "hivex_node_children: nr_subkeys_in_nk = %zu,"
+               " nr_subkeys_in_lf = %zu\n",
                nr_subkeys_in_nk, nr_subkeys_in_lf);
 
     if (nr_subkeys_in_nk != nr_subkeys_in_lf) {
@@ -781,7 +791,8 @@ get_children (hive_h *h, hive_node_h node,
     size_t len = block_len (h, subkey_lf, NULL);
     if (8 + nr_subkeys_in_lf * 8 > len) {
       if (h->msglvl >= 2)
-        fprintf (stderr, "hivex_node_children: returning EFAULT because too many subkeys (%zu, %zu)\n",
+        fprintf (stderr, "hivex_node_children: returning EFAULT"
+                 " because too many subkeys (%zu, %zu)\n",
                  nr_subkeys_in_lf, len);
       errno = EFAULT;
       goto error;
@@ -794,7 +805,8 @@ get_children (hive_h *h, hive_node_h node,
       if (!(flags & GET_CHILDREN_NO_CHECK_NK)) {
         if (!IS_VALID_BLOCK (h, subkey)) {
           if (h->msglvl >= 2)
-            fprintf (stderr, "hivex_node_children: returning EFAULT because subkey is not a valid block (0x%zx)\n",
+            fprintf (stderr, "hivex_node_children: returning EFAULT"
+                     " because subkey is not a valid block (0x%zx)\n",
                      subkey);
           errno = EFAULT;
           goto error;
@@ -818,14 +830,16 @@ get_children (hive_h *h, hive_node_h node,
       offset += 0x1000;
       if (!IS_VALID_BLOCK (h, offset)) {
         if (h->msglvl >= 2)
-          fprintf (stderr, "hivex_node_children: returning EFAULT because ri-offset is not a valid block (0x%zx)\n",
+          fprintf (stderr, "hivex_node_children: returning EFAULT"
+                   " because ri-offset is not a valid block (0x%zx)\n",
                    offset);
         errno = EFAULT;
         goto error;
       }
       if (!BLOCK_ID_EQ (h, offset, "lf") && !BLOCK_ID_EQ (h, offset, "lh")) {
         if (h->msglvl >= 2)
-          fprintf (stderr, "get_children: returning ENOTSUP because ri-record offset does not point to lf/lh (0x%zx)\n",
+          fprintf (stderr, "get_children: returning ENOTSUP"
+                   " because ri-record offset does not point to lf/lh (0x%zx)\n",
                    offset);
         errno = ENOTSUP;
         goto error;
@@ -841,7 +855,8 @@ get_children (hive_h *h, hive_node_h node,
     }
 
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_node_children: nr_subkeys_in_nk = %zu, counted = %zu\n",
+      fprintf (stderr, "hivex_node_children: nr_subkeys_in_nk = %zu,"
+               " counted = %zu\n",
                nr_subkeys_in_nk, count);
 
     if (nr_subkeys_in_nk != count) {
@@ -857,14 +872,16 @@ get_children (hive_h *h, hive_node_h node,
       offset += 0x1000;
       if (!IS_VALID_BLOCK (h, offset)) {
         if (h->msglvl >= 2)
-          fprintf (stderr, "hivex_node_children: returning EFAULT because ri-offset is not a valid block (0x%zx)\n",
+          fprintf (stderr, "hivex_node_children: returning EFAULT"
+                   " because ri-offset is not a valid block (0x%zx)\n",
                    offset);
         errno = EFAULT;
         goto error;
       }
       if (!BLOCK_ID_EQ (h, offset, "lf") && !BLOCK_ID_EQ (h, offset, "lh")) {
         if (h->msglvl >= 2)
-          fprintf (stderr, "get_children: returning ENOTSUP because ri-record offset does not point to lf/lh (0x%zx)\n",
+          fprintf (stderr, "get_children: returning ENOTSUP"
+                   " because ri-record offset does not point to lf/lh (0x%zx)\n",
                    offset);
         errno = ENOTSUP;
         goto error;
@@ -880,7 +897,8 @@ get_children (hive_h *h, hive_node_h node,
         if (!(flags & GET_CHILDREN_NO_CHECK_NK)) {
           if (!IS_VALID_BLOCK (h, subkey)) {
             if (h->msglvl >= 2)
-              fprintf (stderr, "hivex_node_children: returning EFAULT because indirect subkey is not a valid block (0x%zx)\n",
+              fprintf (stderr, "hivex_node_children: returning EFAULT"
+                       " because indirect subkey is not a valid block (0x%zx)\n",
                        subkey);
             errno = EFAULT;
             goto error;
@@ -894,7 +912,8 @@ get_children (hive_h *h, hive_node_h node,
   }
   /* else not supported, set errno and fall through */
   if (h->msglvl >= 2)
-    fprintf (stderr, "get_children: returning ENOTSUP because subkey block is not lf/lh/ri (0x%zx, %d, %d)\n",
+    fprintf (stderr, "get_children: returning ENOTSUP"
+             " because subkey block is not lf/lh/ri (0x%zx, %d, %d)\n",
              subkey_lf, block->id[0], block->id[1]);
   errno = ENOTSUP;
  error:
@@ -967,7 +986,8 @@ hivex_node_parent (hive_h *h, hive_node_h node)
   ret += 0x1000;
   if (!IS_VALID_BLOCK (h, ret)) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_node_parent: returning EFAULT because parent is not a valid block (0x%zx)\n",
+      fprintf (stderr, "hivex_node_parent: returning EFAULT"
+               " because parent is not a valid block (0x%zx)\n",
               ret);
     errno = EFAULT;
     return 0;
@@ -1001,7 +1021,8 @@ get_values (hive_h *h, hive_node_h node,
   /* Arbitrarily limit the number of values we will ever deal with. */
   if (nr_values > HIVEX_MAX_VALUES) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex: get_values: returning ERANGE because nr_values > HIVEX_MAX_VALUES (%zu > %d)\n",
+      fprintf (stderr, "hivex: get_values: returning ERANGE"
+               " because nr_values > HIVEX_MAX_VALUES (%zu > %d)\n",
                nr_values, HIVEX_MAX_VALUES);
     errno = ERANGE;
     goto error;
@@ -1016,7 +1037,8 @@ get_values (hive_h *h, hive_node_h node,
   vlist_offset += 0x1000;
   if (!IS_VALID_BLOCK (h, vlist_offset)) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_node_values: returning EFAULT because value list is not a valid block (0x%zx)\n",
+      fprintf (stderr, "hivex_node_values: returning EFAULT"
+               " because value list is not a valid block (0x%zx)\n",
                vlist_offset);
     errno = EFAULT;
     goto error;
@@ -1031,7 +1053,8 @@ get_values (hive_h *h, hive_node_h node,
   size_t len = block_len (h, vlist_offset, NULL);
   if (4 + nr_values * 4 > len) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_node_values: returning EFAULT because value list is too long (%zu, %zu)\n",
+      fprintf (stderr, "hivex_node_values: returning EFAULT"
+               " because value list is too long (%zu, %zu)\n",
                nr_values, len);
     errno = EFAULT;
     goto error;
@@ -1039,11 +1062,12 @@ get_values (hive_h *h, hive_node_h node,
 
   size_t i;
   for (i = 0; i < nr_values; ++i) {
-    hive_node_h value = vlist->offset[i];
+    hive_node_h value = le32toh (vlist->offset[i]);
     value += 0x1000;
     if (!IS_VALID_BLOCK (h, value)) {
       if (h->msglvl >= 2)
-        fprintf (stderr, "hivex_node_values: returning EFAULT because value is not a valid block (0x%zx)\n",
+        fprintf (stderr, "hivex_node_values: returning EFAULT"
+                 " because value is not a valid block (0x%zx)\n",
                  value);
       errno = EFAULT;
       goto error;
@@ -1129,7 +1153,8 @@ hivex_value_key (hive_h *h, hive_value_h value)
   size_t seg_len = block_len (h, value, NULL);
   if (sizeof (struct ntreg_vk_record) + len - 1 > seg_len) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_value_key: returning EFAULT because key length is too long (%zu, %zu)\n",
+      fprintf (stderr, "hivex_value_key: returning EFAULT"
+               " because key length is too long (%zu, %zu)\n",
                len, seg_len);
     errno = EFAULT;
     return NULL;
@@ -1202,7 +1227,8 @@ hivex_value_value (hive_h *h, hive_value_h value,
   /* Arbitrarily limit the length that we will read. */
   if (len > HIVEX_MAX_VALUE_LEN) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_value_value: returning ERANGE because data length > HIVEX_MAX_VALUE_LEN (%zu > %d)\n",
+      fprintf (stderr, "hivex_value_value: returning ERANGE because data "
+               "length > HIVEX_MAX_VALUE_LEN (%zu > %d)\n",
                len, HIVEX_MAX_SUBKEYS);
     errno = ERANGE;
     return NULL;
@@ -1221,7 +1247,8 @@ hivex_value_value (hive_h *h, hive_value_h value,
   data_offset += 0x1000;
   if (!IS_VALID_BLOCK (h, data_offset)) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_value_value: returning EFAULT because data offset is not a valid block (0x%zx)\n",
+      fprintf (stderr, "hivex_value_value: returning EFAULT because data "
+               "offset is not a valid block (0x%zx)\n",
                data_offset);
     errno = EFAULT;
     free (ret);
@@ -1237,9 +1264,15 @@ hivex_value_value (hive_h *h, hive_value_h value,
   size_t blen = block_len (h, data_offset, NULL);
   if (len > blen - 4 /* subtract 4 for block header */) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_value_value: warning: declared data length is longer than the block it is in (data 0x%zx, data len %zu, block len %zu)\n",
+      fprintf (stderr, "hivex_value_value: warning: declared data length "
+               "is longer than the block it is in "
+               "(data 0x%zx, data len %zu, block len %zu)\n",
                data_offset, len, blen);
     len = blen - 4;
+
+    /* Return the smaller length to the caller too. */
+    if (len_rtn)
+      *len_rtn = len;
   }
 
   char *data = h->addr + data_offset + 4;
@@ -1275,12 +1308,16 @@ windows_utf16_to_utf8 (/* const */ char *input, size_t len)
   size_t r = iconv (ic, &inp, &inlen, &outp, &outlen);
   if (r == (size_t) -1) {
     if (errno == E2BIG) {
+      int err = errno;
       size_t prev = outalloc;
       /* Try again with a larger output buffer. */
       free (out);
       outalloc *= 2;
-      if (outalloc < prev)
+      if (outalloc < prev) {
+        iconv_close (ic);
+        errno = err;
         return NULL;
+      }
       goto again;
     }
     else {
@@ -1315,6 +1352,20 @@ hivex_value_string (hive_h *h, hive_value_h value)
     return NULL;
   }
 
+  /* Deal with the case where Windows has allocated a large buffer
+   * full of random junk, and only the first few bytes of the buffer
+   * contain a genuine UTF-16 string.
+   *
+   * In this case, iconv would try to process the junk bytes as UTF-16
+   * and inevitably find an illegal sequence (EILSEQ).  Instead, stop
+   * after we find the first \0\0.
+   *
+   * (Found by Hilko Bengen in a fresh Windows XP SOFTWARE hive).
+   */
+  size_t slen = utf16_string_len_in_bytes_max (data, len);
+  if (slen < len)
+    len = slen;
+
   char *ret = windows_utf16_to_utf8 (data, len);
   free (data);
   if (ret == NULL)
@@ -1336,16 +1387,18 @@ free_strings (char **argv)
 }
 
 /* Get the length of a UTF-16 format string.  Handle the string as
- * pairs of bytes, looking for the first \0\0 pair.
+ * pairs of bytes, looking for the first \0\0 pair.  Only read up to
+ * 'len' maximum bytes.
  */
 static size_t
-utf16_string_len_in_bytes (const char *str)
+utf16_string_len_in_bytes_max (const char *str, size_t len)
 {
   size_t ret = 0;
 
-  while (str[0] || str[1]) {
+  while (len >= 2 && (str[0] || str[1])) {
     str += 2;
     ret += 2;
+    len -= 2;
   }
 
   return ret;
@@ -1379,7 +1432,8 @@ hivex_value_multiple_strings (hive_h *h, hive_value_h value)
   char *p = data;
   size_t plen;
 
-  while (p < data + len && (plen = utf16_string_len_in_bytes (p)) > 0) {
+  while (p < data + len &&
+         (plen = utf16_string_len_in_bytes_max (p, data + len - p)) > 0) {
     nr_strings++;
     char **ret2 = realloc (ret, (1 + nr_strings) * sizeof (char *));
     if (ret2 == NULL) {
@@ -1464,7 +1518,9 @@ hivex_visit (hive_h *h, const struct hivex_visitor *visitor, size_t len,
   return hivex_visit_node (h, hivex_root (h), visitor, len, opaque, flags);
 }
 
-static int hivex__visit_node (hive_h *h, hive_node_h node, const struct hivex_visitor *vtor, char *unvisited, void *opaque, int flags);
+static int hivex__visit_node (hive_h *h, hive_node_h node,
+                              const struct hivex_visitor *vtor,
+                              char *unvisited, void *opaque, int flags);
 
 int
 hivex_visit_node (hive_h *h, hive_node_h node,
@@ -1512,7 +1568,8 @@ hivex__visit_node (hive_h *h, hive_node_h node,
 
   if (!BITMAP_TST (unvisited, node)) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex__visit_node: contains cycle: visited node 0x%zx already\n",
+      fprintf (stderr, "hivex__visit_node: contains cycle:"
+               " visited node 0x%zx already\n",
                node);
 
     errno = ELOOP;
@@ -1585,14 +1642,16 @@ hivex__visit_node (hive_h *h, hive_node_h node,
           }
           if (vtor->value_string_invalid_utf16) {
             str = hivex_value_value (h, values[i], &t, &len);
-            if (vtor->value_string_invalid_utf16 (h, opaque, node, values[i], t, len, key, str) == -1)
+            if (vtor->value_string_invalid_utf16 (h, opaque, node, values[i],
+                                                  t, len, key, str) == -1)
               goto error;
             free (str); str = NULL;
           }
           break;
         }
         if (vtor->value_string &&
-            vtor->value_string (h, opaque, node, values[i], t, len, key, str) == -1)
+            vtor->value_string (h, opaque, node, values[i],
+                                t, len, key, str) == -1)
           goto error;
         free (str); str = NULL;
         break;
@@ -1601,7 +1660,8 @@ hivex__visit_node (hive_h *h, hive_node_h node,
       case hive_t_dword_be: {
         int32_t i32 = hivex_value_dword (h, values[i]);
         if (vtor->value_dword &&
-            vtor->value_dword (h, opaque, node, values[i], t, len, key, i32) == -1)
+            vtor->value_dword (h, opaque, node, values[i],
+                               t, len, key, i32) == -1)
           goto error;
         break;
       }
@@ -1609,7 +1669,8 @@ hivex__visit_node (hive_h *h, hive_node_h node,
       case hive_t_qword: {
         int64_t i64 = hivex_value_qword (h, values[i]);
         if (vtor->value_qword &&
-            vtor->value_qword (h, opaque, node, values[i], t, len, key, i64) == -1)
+            vtor->value_qword (h, opaque, node, values[i],
+                               t, len, key, i64) == -1)
           goto error;
         break;
       }
@@ -1625,7 +1686,8 @@ hivex__visit_node (hive_h *h, hive_node_h node,
           goto error;
         }
         if (vtor->value_binary &&
-            vtor->value_binary (h, opaque, node, values[i], t, len, key, str) == -1)
+            vtor->value_binary (h, opaque, node, values[i],
+                                t, len, key, str) == -1)
           goto error;
         free (str); str = NULL;
         break;
@@ -1639,14 +1701,16 @@ hivex__visit_node (hive_h *h, hive_node_h node,
           }
           if (vtor->value_string_invalid_utf16) {
             str = hivex_value_value (h, values[i], &t, &len);
-            if (vtor->value_string_invalid_utf16 (h, opaque, node, values[i], t, len, key, str) == -1)
+            if (vtor->value_string_invalid_utf16 (h, opaque, node, values[i],
+                                                  t, len, key, str) == -1)
               goto error;
             free (str); str = NULL;
           }
           break;
         }
         if (vtor->value_multiple_strings &&
-            vtor->value_multiple_strings (h, opaque, node, values[i], t, len, key, strs) == -1)
+            vtor->value_multiple_strings (h, opaque, node, values[i],
+                                          t, len, key, strs) == -1)
           goto error;
         free_strings (strs); strs = NULL;
         break;
@@ -1661,7 +1725,8 @@ hivex__visit_node (hive_h *h, hive_node_h node,
           goto error;
         }
         if (vtor->value_other &&
-            vtor->value_other (h, opaque, node, values[i], t, len, key, str) == -1)
+            vtor->value_other (h, opaque, node, values[i],
+                               t, len, key, str) == -1)
           goto error;
         free (str); str = NULL;
         break;
@@ -1736,9 +1801,11 @@ allocate_page (hive_h *h, size_t allocation_hint)
   ssize_t extend = h->endpages + nr_4k_pages * 4096 - h->size;
 
   if (h->msglvl >= 2) {
-    fprintf (stderr, "allocate_page: current endpages = 0x%zx, current size = 0x%zx\n",
+    fprintf (stderr, "allocate_page: current endpages = 0x%zx,"
+             " current size = 0x%zx\n",
              h->endpages, h->size);
-    fprintf (stderr, "allocate_page: extending file by %zd bytes (<= 0 if no extension)\n",
+    fprintf (stderr, "allocate_page: extending file by %zd bytes"
+             " (<= 0 if no extension)\n",
              extend);
   }
 
@@ -1823,8 +1890,8 @@ allocate_block (hive_h *h, size_t seg_len, const char id[2])
      * for them, albeit unusual.
      */
     if (h->msglvl >= 2)
-      fprintf (stderr, "allocate_block: refusing too small allocation (%zu), returning ERANGE\n",
-               seg_len);
+      fprintf (stderr, "allocate_block: refusing too small allocation (%zu),"
+               " returning ERANGE\n", seg_len);
     errno = ERANGE;
     return 0;
   }
@@ -1832,8 +1899,8 @@ allocate_block (hive_h *h, size_t seg_len, const char id[2])
   /* Refuse really large allocations. */
   if (seg_len > HIVEX_MAX_ALLOCATION) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "allocate_block: refusing large allocation (%zu), returning ERANGE\n",
-               seg_len);
+      fprintf (stderr, "allocate_block: refusing large allocation (%zu),"
+               " returning ERANGE\n", seg_len);
     errno = ERANGE;
     return 0;
   }
@@ -1879,8 +1946,8 @@ allocate_block (hive_h *h, size_t seg_len, const char id[2])
   ssize_t rem = h->endpages - h->endblocks;
   if (rem > 0) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "allocate_block: marking remainder of page free starting at 0x%zx, size %zd\n",
-               h->endblocks, rem);
+      fprintf (stderr, "allocate_block: marking remainder of page free"
+               " starting at 0x%zx, size %zd\n", h->endblocks, rem);
 
     assert (rem >= 4);
 
@@ -2158,7 +2225,8 @@ hivex_node_add_child (hive_h *h, hive_node_h parent, const char *name)
     return 0;
 
   if (h->msglvl >= 2)
-    fprintf (stderr, "hivex_node_add_child: allocated new nk-record for child at 0x%zx\n", node);
+    fprintf (stderr, "hivex_node_add_child: allocated new nk-record"
+             " for child at 0x%zx\n", node);
 
   struct ntreg_nk_record *nk = (struct ntreg_nk_record *) (h->addr + node);
   nk->flags = htole16 (0x0020); /* key is ASCII. */
@@ -2178,7 +2246,8 @@ hivex_node_add_child (hive_h *h, hive_node_h parent, const char *name)
   if (!IS_VALID_BLOCK (h, parent_sk_offset) ||
       !BLOCK_ID_EQ (h, parent_sk_offset, "sk")) {
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_node_add_child: returning EFAULT because parent sk is not a valid block (%zu)\n",
+      fprintf (stderr, "hivex_node_add_child: returning EFAULT"
+               " because parent sk is not a valid block (%zu)\n",
                parent_sk_offset);
     errno = EFAULT;
     return 0;
@@ -2232,7 +2301,8 @@ hivex_node_add_child (hive_h *h, hive_node_h parent, const char *name)
     parent_nk = (struct ntreg_nk_record *) (h->addr + parent);
 
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_node_add_child: no keys, allocated new lh-record at 0x%zx\n", lh_offs);
+      fprintf (stderr, "hivex_node_add_child: no keys, allocated new"
+               " lh-record at 0x%zx\n", lh_offs);
 
     parent_nk->subkey_lf = htole32 (lh_offs - 0x1000);
   }
@@ -2264,7 +2334,8 @@ hivex_node_add_child (hive_h *h, hive_node_h parent, const char *name)
     /* Insert it. */
   insert_it:
     if (h->msglvl >= 2)
-      fprintf (stderr, "hivex_node_add_child: insert key in existing lh-record at 0x%zx, posn %zu\n", old_offs, j);
+      fprintf (stderr, "hivex_node_add_child: insert key in existing"
+               " lh-record at 0x%zx, posn %zu\n", old_offs, j);
 
     new_offs = insert_lf_record (h, old_offs, j, name, node);
     if (new_offs == 0) {
@@ -2305,7 +2376,8 @@ hivex_node_add_child (hive_h *h, hive_node_h parent, const char *name)
 
       /* Not found ..  This is an internal error. */
       if (h->msglvl >= 2)
-        fprintf (stderr, "hivex_node_add_child: returning ENOTSUP because could not find ri->lf link\n");
+        fprintf (stderr, "hivex_node_add_child: returning ENOTSUP"
+                 " because could not find ri->lf link\n");
       errno = ENOTSUP;
       free (blocks);
       return 0;
@@ -2498,7 +2570,8 @@ hivex_node_delete_child (hive_h *h, hive_node_h node)
     }
   }
   if (h->msglvl >= 2)
-    fprintf (stderr, "hivex_node_delete_child: could not find parent to child link\n");
+    fprintf (stderr, "hivex_node_delete_child: could not find parent"
+             " to child link\n");
   errno = ENOTSUP;
   return -1;
 
@@ -2508,8 +2581,8 @@ hivex_node_delete_child (hive_h *h, hive_node_h node)
   nk->nr_subkeys = htole32 (nr_subkeys_in_nk - 1);
 
   if (h->msglvl >= 2)
-    fprintf (stderr, "hivex_node_delete_child: updating nr_subkeys in parent 0x%zx to %zu\n",
-             parent, nr_subkeys_in_nk);
+    fprintf (stderr, "hivex_node_delete_child: updating nr_subkeys"
+             " in parent 0x%zx to %zu\n", parent, nr_subkeys_in_nk);
 
   return 0;
 }
@@ -2609,7 +2682,7 @@ hivex_node_set_values (hive_h *h, hive_node_h node,
 
 int
 hivex_node_set_value (hive_h *h, hive_node_h node,
-		      const hive_set_value *val, int flags)
+                      const hive_set_value *val, int flags)
 {
   hive_value_h *prev_values = hivex_node_values (h, node);
   if (prev_values == NULL)