Index: src/plugins/ole2_extractor.c
===================================================================
--- src/plugins/ole2_extractor.c	(revision 18339)
+++ src/plugins/ole2_extractor.c	(working copy)
@@ -473,8 +473,7 @@
 	    ret = addKeyword(proc, proc_cls,
 			     rbuf,
 			     EXTRACTOR_METATYPE_REVISION_HISTORY);    
-	    if (rbuf != NULL)
-	      free(rbuf);
+	    free(rbuf);
 	  }
       }
     if (author != NULL)
Index: src/plugins/tar_extractor.c
===================================================================
--- src/plugins/tar_extractor.c	(revision 18339)
+++ src/plugins/tar_extractor.c	(working copy)
@@ -73,7 +73,7 @@
    * for UNIX V7 TAR archive members ;
    * their header is always 512 octets long nevertheless.
    */
-  char ustarMagic[6];
+  char ustarMagic[7];
   char version[2];
   char userName[32];
   char groupName[32];
@@ -379,7 +379,7 @@
               TAR_GNU2004_FORMAT;
 
         }
-      else if (0 == memcmp (tar->ustarMagic, "ustar", 6))
+      else if (0 == memcmp (tar->ustarMagic, "ustar", 5))
         {
 
           /*