From 91dec9d4c784158f3b056b203b247bc09941fc37 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-4990.basistech.net>
Date: Mon, 25 Feb 2019 11:40:25 -0500
Subject: [PATCH] Fixed indentation and updated comment
---
tsk/auto/auto_db.cpp | 32 ++++++++++++++++----------------
tsk/img/tsk_img_i.h | 27 ++++++++++++++-------------
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index 5eeab9381..5772361de 100755
--- a/tsk/auto/auto_db.cpp
+++ b/tsk/auto/auto_db.cpp
@@ -222,25 +222,25 @@ TskAutoDb::addImageDetails(const char* deviceId)
sha1 = ewf_info->sha1hash;
}
- //Need 1MB for libewf read and extra 100 bytes for header name and formatting
+ //Need 1MB for libewf read and extra 100 bytes for header name and formatting
const size_t buffer_size = 1024100;
char result[buffer_size];
- //Populate all of the libewf header values for the acquisition details column
- collectionDetails.append(libewf_read_description(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_case_number(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_evidence_number(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_examiner_name(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_notes(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_model(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_serial_number(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_device_label(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_version(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_platform(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_acquired_date(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_system_date(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_acquiry_operating_system(ewf_info->handle, result, buffer_size));
- collectionDetails.append(libewf_read_acquiry_software_version(ewf_info->handle, result, buffer_size));
+ //Populate all of the libewf header values for the acquisition details column
+ collectionDetails.append(libewf_read_description(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_case_number(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_evidence_number(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_examiner_name(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_notes(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_model(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_serial_number(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_device_label(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_version(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_platform(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_acquired_date(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_system_date(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_acquiry_operating_system(ewf_info->handle, result, buffer_size));
+ collectionDetails.append(libewf_read_acquiry_software_version(ewf_info->handle, result, buffer_size));
}
#endif
diff --git a/tsk/img/tsk_img_i.h b/tsk/img/tsk_img_i.h
index 5a3c97c33..16a5c5103 100755
--- a/tsk/img/tsk_img_i.h
+++ b/tsk/img/tsk_img_i.h
@@ -45,24 +45,25 @@ inline int is_blank(const char* str) {
}
/**
-* Reads the first 1 MB of the libewf header
+* Reads from libewf what is left in the buffer after the addition of the key and new line
*/
inline char* read_libewf_header_value(libewf_handle_t *handle, char* result_buffer, const size_t buffer_size, const uint8_t *identifier, size_t identifier_length, const char* key) {
- result_buffer[0] = '\0';
+ result_buffer[0] = '\0';
strcpy(result_buffer, key);
- libewf_error_t * ewf_error;
- size_t key_len = strlen(key);
+ libewf_error_t * ewf_error;
+ size_t key_len = strlen(key);
- int result = libewf_handle_get_utf8_header_value(handle, identifier, identifier_length, (uint8_t *)(result_buffer + key_len), buffer_size - key_len, &ewf_error);
- if (result != -1 && !is_blank(result_buffer + key_len)) {
- strcat(result_buffer, "\n");
- } else {
- //if blank or error, return nothing!
- result_buffer[0] = '\0';
- }
-
- return result_buffer;
+ //buffer_size - key_len - 1 for the new line at the end
+ int result = libewf_handle_get_utf8_header_value(handle, identifier, identifier_length, (uint8_t *)(result_buffer + key_len), buffer_size - key_len - 1, &ewf_error);
+ if (result != -1 && !is_blank(result_buffer + key_len)) {
+ strcat(result_buffer, "\n");
+ } else {
+ //if blank or error, return nothing!
+ result_buffer[0] = '\0';
+ }
+
+ return result_buffer;
}
inline char* libewf_read_description(libewf_handle_t *handle, char* result_buffer, const size_t buffer_size) {
--
GitLab