ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-18 18:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iso9660: fix reading of large directory entries

Browse Source 
This commit makes it possible to read directory entries that span
more than one sector.

Fixes #2038.
This commit is contained in:
Josef Söntgen 2016-07-07 14:36:16 +02:00 committed by Norman Feske
parent cad4d4f970
commit 1d9f10e3b6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
repos/os/src/server/iso9660/iso9660.cc
View File

@ -427,9 +427,16 @@ namespace Iso {
t.string(level, PATH_LENGTH);
/*
* Save current block number in a variable because successive
* iterations might override the memory location where dir points
* to when a directory entry spans several sectors.
*/
uint32_t current_blk_nr = dir->blk_nr();
/* load extent of directory record and search for level */
for (unsigned long i = 0; i < Sector::to_blk(dir->data_length()); i++) {
Sector sec(dir->blk_nr() + i, 1);
Sector sec(current_blk_nr + i, 1);
Directory_record *tmp = sec.addr<Directory_record *>()->locate(level);
if (!tmp && i == Sector::to_blk(dir->data_length()) - 1) {
@ -440,12 +447,13 @@ namespace Iso {
if (!tmp) continue;
dir = tmp;
current_blk_nr = dir->blk_nr();
if (verbose)
PDBG("Found %s", level);
if (!dir->directory()) {
blk_nr = dir->blk_nr();
blk_nr = current_blk_nr;
data_length = dir->data_length();
}