fixed issue 3052302 re: tsk_malloc trying to do a memset on data that…

… was not allocated
sleuthkit · Sep 18, 2010 · 7eaa38c · 7eaa38c
1 parent e9d21ee
commit 7eaa38c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/NEWS.txt b/NEWS.txt
@@ -7,6 +7,8 @@ Bug Fixes
 - 3043092: Minor logic errors with ifind code. 
 - FAT performance fix when looking for parent directories
   in $OrphanFiles. 
+- 3052302: Crash on NTFS/UFS detection test because of
+  corrupt data -- tsk_malloc error. 
 
 New Features:
 - 3012324: Name mangling moved out of library into outer tools

diff --git a/tsk3/base/mymalloc.c b/tsk3/base/mymalloc.c
@@ -73,7 +73,9 @@ tsk_malloc(size_t len)
         snprintf(tsk_errstr, TSK_ERRSTR_L, "tsk_malloc: %s",
             strerror(errno));
     }
-    memset(ptr, 0, len);
+    else {
+        memset(ptr, 0, len);
+    }
     return (ptr);
 }