Skip to content

Add have_physical_chain fixes. #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tbybell merged 1 commit into from
Nov 12, 2026
Merged

Add have_physical_chain fixes. #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 19 additions & 7 deletions src/fstapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5068,6 +5068,7 @@ static int fstReaderParseChainTable(unsigned char *chain_cmem,
fstHandle pidx = 0;
uint64_t pval = 0;
uint32_t prev_alias = 0;
int have_physical_chain = 0;
fstHandle i;

/* check if there is space for `n` more entries */
Expand All @@ -5086,10 +5087,11 @@ static int fstReaderParseChainTable(unsigned char *chain_cmem,

if (shval > 0) {
pval = chain_table[idx] = pval + shval;
if (idx) {
if (have_physical_chain) {
chain_table_lengths[pidx] = pval - chain_table[pidx];
}
pidx = idx++;
have_physical_chain = 1;
} else if (shval < 0) {
chain_table[idx] =
0; /* need to explicitly zero as calloc above might not run */
Expand All @@ -5112,7 +5114,9 @@ static int fstReaderParseChainTable(unsigned char *chain_cmem,
}

for (i = 0; i < loopcnt; i++) {
chain_table[idx++] = 0;
chain_table[idx] = 0;
chain_table_lengths[idx] = 0;
idx++;
}
}

Expand Down Expand Up @@ -5145,10 +5149,11 @@ static int fstReaderParseChainTable(unsigned char *chain_cmem,
}

pval = chain_table[idx] = pval + (val >> 1);
if (idx) {
if (have_physical_chain) {
chain_table_lengths[pidx] = pval - chain_table[pidx];
}
pidx = idx++;
have_physical_chain = 1;
} else {
fstHandle loopcnt = val >> 1;

Expand All @@ -5157,7 +5162,9 @@ static int fstReaderParseChainTable(unsigned char *chain_cmem,
}

for (i = 0; i < loopcnt; i++) {
chain_table[idx++] = 0;
chain_table[idx] = 0;
chain_table_lengths[idx] = 0;
idx++;
}
}

Expand All @@ -5170,7 +5177,8 @@ static int fstReaderParseChainTable(unsigned char *chain_cmem,
/* the entry the room check kept back, so that the last chain a length was
written to is as long as the distance from it to the end of the data */
chain_table[idx] = vc_len;
chain_table_lengths[pidx] = chain_table[idx] - chain_table[pidx];
if (have_physical_chain)
chain_table_lengths[pidx] = chain_table[idx] - chain_table[pidx];

for (i = 0; i < idx; i++) {
int32_t v32 = chain_table_lengths[i];
Expand Down Expand Up @@ -5774,7 +5782,9 @@ int fstReaderIterBlocks2(fstReaderContext *ctx,
unsigned char *mc; /* comp: src */
unsigned long destlen = val;

if (((uint64_t)traversal_mem_offs + destlen) > mem_required_for_traversal) {
if ((uint64_t)traversal_mem_offs > mem_required_for_traversal ||
(uint64_t)val > mem_required_for_traversal - traversal_mem_offs ||
(uint64_t)val > UINT32_MAX - traversal_mem_offs) {
goto block_err;
}

Expand Down Expand Up @@ -5816,7 +5826,9 @@ int fstReaderIterBlocks2(fstReaderContext *ctx,
uint32_t destlen = sourcelen;
unsigned char *mu = mem_for_traversal + traversal_mem_offs;

if (((uint64_t)traversal_mem_offs + destlen) > mem_required_for_traversal) {
if ((uint64_t)traversal_mem_offs > mem_required_for_traversal ||
(uint64_t)destlen > mem_required_for_traversal - traversal_mem_offs ||
(uint64_t)destlen > UINT32_MAX - traversal_mem_offs) {
goto block_err;
}

Expand Down
Loading