Skip to content
Snippets Groups Projects
Commit 60b0455c authored by Brian Carrier's avatar Brian Carrier
Browse files

Fix 2266104 (istat on in Unix)

parent b307b630
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
11/11/08: Bug Fix: Fixed crashing bug in ifind on FAT file system. Bug: 2265927 11/11/08: Bug Fix: Fixed crashing bug in ifind on FAT file system. Bug: 2265927
11/11/08: Bug Fix: Fixed crashing bug in istat on ExtX $OrphanFiles dir. Bug: 2266104
---------------- VERSION 3.0.0 -------------- ---------------- VERSION 3.0.0 --------------
0/00/00: Update: Many, many, many API changes. 0/00/00: Update: Many, many, many API changes.
......
This diff is collapsed.
...@@ -314,6 +314,14 @@ ffs_dinode_copy(FFS_INFO * ffs, TSK_FS_META * fs_meta) ...@@ -314,6 +314,14 @@ ffs_dinode_copy(FFS_INFO * ffs, TSK_FS_META * fs_meta)
unsigned char *inosused = NULL; unsigned char *inosused = NULL;
TSK_INUM_T ibase; TSK_INUM_T ibase;
if (ffs->dino_buf == NULL) {
tsk_error_reset();
tsk_errno = TSK_ERR_FS_ARG;
snprintf(tsk_errstr, TSK_ERRSTR_L,
"ffs_dinode_copy: dino_buf is NULL");
return 1;
}
fs_meta->attr_state = TSK_FS_META_ATTR_EMPTY; fs_meta->attr_state = TSK_FS_META_ATTR_EMPTY;
if (fs_meta->attr) { if (fs_meta->attr) {
tsk_fs_attrlist_markunused(fs_meta->attr); tsk_fs_attrlist_markunused(fs_meta->attr);
...@@ -1683,7 +1691,8 @@ ffs_istat(TSK_FS_INFO * fs, FILE * hFile, TSK_INUM_T inum, ...@@ -1683,7 +1691,8 @@ ffs_istat(TSK_FS_INFO * fs, FILE * hFile, TSK_INUM_T inum,
tsk_fprintf(hFile, "File Modified:\t%s", ctime(&fs_meta->mtime)); tsk_fprintf(hFile, "File Modified:\t%s", ctime(&fs_meta->mtime));
tsk_fprintf(hFile, "Inode Modified:\t%s", ctime(&fs_meta->ctime)); tsk_fprintf(hFile, "Inode Modified:\t%s", ctime(&fs_meta->ctime));
if (fs->ftype == TSK_FS_TYPE_FFS2) { // we won't have dino_buf for "virtual" files
if ((fs->ftype == TSK_FS_TYPE_FFS2) && (ffs->dino_buf)) {
ffs_inode2 *in = (ffs_inode2 *) ffs->dino_buf; ffs_inode2 *in = (ffs_inode2 *) ffs->dino_buf;
/* Are there extended attributes */ /* Are there extended attributes */
if (tsk_getu32(fs->endian, in->di_extsize) > 0) { if (tsk_getu32(fs->endian, in->di_extsize) > 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment