mirror/libbacktrace
1
0
Fork 0
mirror of https://github.com/ianlancetaylor/libbacktrace.git synced 2026-06-14 02:29:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libbacktrace: support compressed block with no sequences

Browse Source 
* elf.c (elf_zstd_decompress_frame): Support a compressed block
	with no sequences, only literals.

Fixes #164
This commit is contained in:
Ian Lance Taylor
2026-06-01 21:34:27 -07:00
parent 9477521bc1
commit 549b81b43b
1 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
elf.c
View File

@@ -4620,6 +4620,11 @@ elf_zstd_decompress_frame (const unsigned char **ppin,
pin += 2; pin += 2;
} }
pback = NULL;
bits = 0;
literal_state = 0;
offset_state = 0;
match_state = 0;
if (seq_count > 0) if (seq_count > 0)
{ {
int (*pfn)(const struct elf_zstd_fse_entry *, int (*pfn)(const struct elf_zstd_fse_entry *,
@@ -4659,7 +4664,6 @@ elf_zstd_decompress_frame (const unsigned char **ppin,
match_fse_table, 9, pfn, match_fse_table, 9, pfn,
&match_decode)) &match_decode))
return 0; return 0;
}
pback = pblockend - 1; pback = pblockend - 1;
if (!elf_fetch_backward_init (&pback, pin, &val, &bits)) if (!elf_fetch_backward_init (&pback, pin, &val, &bits))
@@ -4680,6 +4684,7 @@ elf_zstd_decompress_frame (const unsigned char **ppin,
bits -= match_decode.table_bits; bits -= match_decode.table_bits;
match_state = ((val >> bits) match_state = ((val >> bits)
& ((1U << match_decode.table_bits) - 1)); & ((1U << match_decode.table_bits) - 1));
}
seq = 0; seq = 0;
while (1) while (1)
@@ -4701,6 +4706,40 @@ elf_zstd_decompress_frame (const unsigned char **ppin,
uint32_t need; uint32_t need;
uint32_t add; uint32_t add;
if (unlikely (seq >= seq_count))
{
/* Copy remaining literals. */
if (literal_count > 0 && plit != pout)
{
if (unlikely ((size_t)(poutend - pout)
< literal_count))
{
elf_uncompress_failed ();
return 0;
}
if ((size_t)(plit - pout) < literal_count)
{
uint32_t move;
move = plit - pout;
while (literal_count > move)
{
memcpy (pout, plit, move);
pout += move;
plit += move;
literal_count -= move;
}
}
memcpy (pout, plit, literal_count);
}
pout += literal_count;
break;
}
pt = &offset_decode.table[offset_state]; pt = &offset_decode.table[offset_state];
offset_basebits = pt->basebits; offset_basebits = pt->basebits;
offset_baseline = pt->baseline; offset_baseline = pt->baseline;
@@ -4938,40 +4977,6 @@ elf_zstd_decompress_frame (const unsigned char **ppin,
} }
} }
} }
if (unlikely (seq >= seq_count))
{
/* Copy remaining literals. */
if (literal_count > 0 && plit != pout)
{
if (unlikely ((size_t)(poutend - pout)
< literal_count))
{
elf_uncompress_failed ();
return 0;
}
if ((size_t)(plit - pout) < literal_count)
{
uint32_t move;
move = plit - pout;
while (literal_count > move)
{
memcpy (pout, plit, move);
pout += move;
plit += move;
literal_count -= move;
}
}
memcpy (pout, plit, literal_count);
}
pout += literal_count;
break;
}
} }
pin = pblockend; pin = pblockend;