Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tsk/img/ewf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ std::string ewf_get_details(IMG_EWF_INFO *ewf_info) {

char* result = (char*)tsk_malloc(buffer_size);
if (result == NULL) {
return NULL;
return "";
}

string collectionDetails = "";
Expand Down
4 changes: 2 additions & 2 deletions tsk/img/img_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "tsk_img_i.h"

// This function assumes that we hold the cache_lock even though we're not modyfying
// This function assumes that we hold the cache_lock even though we're not modifying
// the cache. This is because the lower-level read callbacks make the same assumption.
static ssize_t tsk_img_read_no_cache(TSK_IMG_INFO * a_img_info, TSK_OFF_T a_off,
char *a_buf, size_t a_len)
Expand All @@ -22,7 +22,7 @@ static ssize_t tsk_img_read_no_cache(TSK_IMG_INFO * a_img_info, TSK_OFF_T a_off,
/* Some of the lower-level methods like block-sized reads.
* So if the len is not that multiple, then make it. */
if ((a_img_info->sector_size > 0) && (a_len % a_img_info->sector_size)) {
char *buf2 = a_buf;
char *buf2 = NULL;

size_t len_tmp;
len_tmp = roundup(a_len, a_img_info->sector_size);
Expand Down
Loading