Skip to content

Fix a couple issues with end tags #332

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
martin-hughes merged 2 commits into from
Sep 1, 2026
Merged

Fix a couple issues with end tags #332

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9748050
Fix end tag value for ConcatenateResTemplate.
dewyatt Aug 20, 2026
31b3057
Fix ConcatenateResTemplate end tags.
dewyatt Aug 20, 2026
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
13 changes: 10 additions & 3 deletions src/aml/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,10 +529,17 @@ where
let source1 = source1.as_buffer()?;
let source2 = source2.as_buffer()?;
let result = {
let mut buffer = Vec::from(source1);
buffer.extend_from_slice(source2);
fn strip_end_tag(buf: &[u8]) -> &[u8] {
if buf.len() >= 2 && buf[buf.len() - 2] == 0x79 {
buf.split_at(buf.len() - 2).0
} else {
buf
}
}
let mut buffer = Vec::from(strip_end_tag(source1));
buffer.extend_from_slice(strip_end_tag(source2));
// Add a new end-tag
buffer.push(0x78);
buffer.push(0x79);
// Don't calculate the new real checksum - just use 0
buffer.push(0x00);
Object::Buffer(buffer).wrap()
Expand Down
Loading