Skip to content
Open
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
9 changes: 9 additions & 0 deletions libesedb/libesedb_page_header.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,15 @@ int libesedb_page_header_read_data(
( (esedb_page_header_t *) data )->available_page_tag,
page_header->available_page_tag );

/* In the 32KiB page format the upper 4 bits of the available page tag
* are reserved (ctagReserved) and the lower 12 bits contain the actual
* number of page tags
*/
if( io_handle->page_size >= 32768 )
{
page_header->available_page_tag &= 0x0fff;
}

byte_stream_copy_to_uint32_little_endian(
( (esedb_page_header_t *) data )->page_flags,
page_header->flags );
Expand Down
47 changes: 45 additions & 2 deletions libesedb/libesedb_page_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -1453,8 +1453,6 @@ int libesedb_page_tree_get_get_first_leaf_page_number(

return( -1 );
}
last_leaf_page_number = safe_leaf_page_number;

if( libfdata_vector_get_element_value_by_index(
page_tree->pages_vector,
(intptr_t *) file_io_handle,
Expand All @@ -1474,6 +1472,29 @@ int libesedb_page_tree_get_get_first_leaf_page_number(

return( -1 );
}
/* Stop backward walk if the page is not a leaf page
*/
if( libesedb_page_get_flags(
page,
&page_flags,
error ) != 1 )
{
libcerror_error_set(
error,
LIBCERROR_ERROR_DOMAIN_RUNTIME,
LIBCERROR_RUNTIME_ERROR_GET_FAILED,
"%s: unable to retrieve page flags from page: %" PRIu32 ".",
function,
safe_leaf_page_number );

return( -1 );
}
if( ( page_flags & LIBESEDB_PAGE_FLAG_IS_LEAF ) == 0 )
{
break;
}
last_leaf_page_number = safe_leaf_page_number;

if( libesedb_page_get_previous_page_number(
page,
&safe_leaf_page_number,
Expand Down Expand Up @@ -1671,6 +1692,7 @@ int libesedb_page_tree_get_number_of_leaf_values(
libesedb_page_t *page = NULL;
static char *function = "libesedb_page_tree_get_number_of_leaf_values";
uint32_t leaf_page_number = 0;
uint32_t page_flags = 0;
int number_of_leaf_pages = 0;
int safe_number_of_leaf_values = 0;
int value_index = 0;
Expand Down Expand Up @@ -1763,6 +1785,27 @@ int libesedb_page_tree_get_number_of_leaf_values(

goto on_error;
}
/* Stop forward walk if the page is not a leaf page
*/
if( libesedb_page_get_flags(
page,
&page_flags,
error ) != 1 )
{
libcerror_error_set(
error,
LIBCERROR_ERROR_DOMAIN_RUNTIME,
LIBCERROR_RUNTIME_ERROR_GET_FAILED,
"%s: unable to retrieve page flags from page: %" PRIu32 ".",
function,
leaf_page_number );

goto on_error;
}
if( ( page_flags & LIBESEDB_PAGE_FLAG_IS_LEAF ) == 0 )
{
break;
}
if( libesedb_page_tree_get_number_of_leaf_values_from_leaf_page(
page_tree,
page,
Expand Down