diff --git a/bindings/java/src/org/sleuthkit/datamodel/TskCaseDbBridge.java b/bindings/java/src/org/sleuthkit/datamodel/TskCaseDbBridge.java index c66755ac36cabafe5c6a2ba38df60417ecc73adc..cee51945acc4b4f0b86cc06ab7dcab0e29548c2d 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/TskCaseDbBridge.java +++ b/bindings/java/src/org/sleuthkit/datamodel/TskCaseDbBridge.java @@ -394,8 +394,14 @@ private long addBatchedFilesToDb() { parentDirCache.put(key, objId); } } catch (TskCoreException ex) { - logger.log(Level.SEVERE, "Error adding file to the database - parent object ID: " + computedParentObjId + if (computedParentObjId > 0) { + // Most likely a database error occurred + logger.log(Level.SEVERE, "Error adding file to the database - parent object ID: " + computedParentObjId + ", file system object ID: " + fileInfo.fsObjId + ", name: " + fileInfo.name, ex); + } else { + // The parent lookup failed + logger.log(Level.SEVERE, "Error adding file to the database", ex); + } } } commitTransaction(); @@ -436,7 +442,7 @@ private long getParentObjId(FileInfo fileInfo) throws TskCoreException { } else { // There's no reason to do a database query since every folder added is being // stored in the cache. - throw new TskCoreException("Parent not found in cache (fsObjId: " +fileInfo.fsObjId + ", parMetaAddr: " + fileInfo.parMetaAddr + throw new TskCoreException("Could not find parent (fsObjId: " +fileInfo.fsObjId + ", parMetaAddr: " + fileInfo.parMetaAddr + ", parSeq: " + fileInfo.parSeq + ", parentPath: " + parentPath + ")"); } } diff --git a/tsk/fs/yaffs.cpp b/tsk/fs/yaffs.cpp index f5ec30a09dde02577111ed506242ec1c48b2fd2c..620f38e70410303c6a9d840b7e556e70322613fa 100755 --- a/tsk/fs/yaffs.cpp +++ b/tsk/fs/yaffs.cpp @@ -1762,7 +1762,6 @@ static uint8_t if (tsk_verbose) tsk_fprintf(stderr, "yaffs_make_deleted: Making virtual deleted node\n"); - if (yaffs_make_directory(yaffsfs, fs_file, YAFFS_OBJECT_DELETED, YAFFS_OBJECT_DELETED_NAME)) return 1; @@ -1931,7 +1930,6 @@ static uint8_t case YAFFS_TYPE_HARDLINK: case YAFFS_TYPE_UNKNOWN: - default: if (tsk_verbose) tsk_fprintf(stderr, "yaffs_inode_lookup: is *** UNHANDLED *** (type %d, header at 0x%x)\n", type, version->ycv_header_chunk->ycc_offset); // We can still set a few things @@ -1955,6 +1953,10 @@ static uint8_t strncpy(a_fs_file->meta->name2->name, real_name, TSK_FS_META_NAME_LIST_NSIZE); break; + default: + if (tsk_verbose) + tsk_fprintf(stderr, "yaffs_inode_lookup: type is invalid (type %d, header at 0x%x)\n", type, version->ycv_header_chunk->ycc_offset); + return 1; } /* Who owns this? I'm following the way FATFS does it by freeing + NULLing