michael/minify-html
michael
/
minify-html
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix boundary bugs

This commit is contained in:
Wilson Lin 2020-07-27 17:56:19 +10:00
parent c379f6667f
commit e8726c2ed1
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/proc/mod.rs
View File

@ -239,8 +239,12 @@ impl<'d> Processor<'d> {
}
// Looking behind.
pub fn last(&self, count: usize) -> &[u8] {
self.code.get(self.write_next - count..self.write_next).unwrap()
pub fn last(&self, count: usize) -> Option<&[u8]> {
if count > self.write_next {
None
} else {
self.code.get(self.write_next - count..self.write_next)
}
}
// Consuming source characters.
@ -321,14 +325,16 @@ impl<'d> Processor<'d> {
// Since we consume the Processor, we must provide a full Error with positions.
#[cfg(not(feature = "js-esbuild"))]
pub fn finish(self) -> Result<usize, Error> {
debug_assert!(self.at_end());
// NOTE: Do not assert that we are at the end, as invalid HTML can end prematurely e.g.
// `<html>hello</html>outside`.
Ok(self.write_next)
}
// Since we consume the Processor, we must provide a full Error with positions.
#[cfg(feature = "js-esbuild")]
pub fn finish(self) -> Result<usize, Error> {
debug_assert!(self.at_end());
// NOTE: Do not assert that we are at the end, as invalid HTML can end prematurely e.g.
// `<html>hello</html>outside`.
self.script_wg.wait();
let mut results = Arc::try_unwrap(self.script_results)
.unwrap_or_else(|_| panic!("failed to acquire script results"))

3
src/unit/content.rs
View File

@ -139,7 +139,8 @@ pub fn process_content(proc: &mut Processor, cfg: &Cfg, ns: Namespace, parent: O
// Problem: semicolon after encoded '<' will cause '&LT;', making it part of the entity.
// Solution: insert another semicolon.
// NOTE: We can't just peek at the time of inserting '&LT', as the semicolon might be encoded.
if proc.last(3) == b"&LT" {
// TODO Optimise, maybe using last written flag.
if let Some(b"&LT") = proc.last(3) {
proc.write(b';');
};
proc.accept_expect();