1
0
Fork 0
mirror of https://github.com/sile/hls_m3u8.git synced 2024-11-26 09:00:58 +00:00

Fix attribute value parsing bug

This commit is contained in:
Takeru Ohta 2018-02-18 23:36:52 +09:00
parent 2effe63f4d
commit 2b5a79b648

View file

@ -41,11 +41,22 @@ impl<'a> AttributePairs<'a> {
} }
fn parse_raw_value(&mut self) -> &'a str { fn parse_raw_value(&mut self) -> &'a str {
let (value_end, next) = if let Some(i) = self.input.bytes().position(|c| c == b',') { let mut in_quote = false;
(i, i + 1) let mut value_end = self.input.len();
} else { let mut next = self.input.len();
(self.input.len(), self.input.len()) for (i, c) in self.input.bytes().enumerate() {
}; match c {
b'"' => {
in_quote = !in_quote;
}
b',' if !in_quote => {
value_end = i;
next = i + 1;
break;
}
_ => {}
}
}
let (value, _) = self.input.split_at(value_end); let (value, _) = self.input.split_at(value_end);
let (_, rest) = self.input.split_at(next); let (_, rest) = self.input.split_at(next);
self.input = rest; self.input = rest;
@ -74,3 +85,20 @@ impl<'a> Iterator for AttributePairs<'a> {
Some(result) Some(result)
} }
} }
#[cfg(test)]
mod test {
use super::*;
#[test]
fn it_works() {
let mut pairs = AttributePairs::parse("FOO=BAR,BAR=\"baz,qux\",ABC=12.3");
assert_eq!(pairs.next().map(|x| x.ok()), Some(Some(("FOO", "BAR"))));
assert_eq!(
pairs.next().map(|x| x.ok()),
Some(Some(("BAR", "\"baz,qux\"")))
);
assert_eq!(pairs.next().map(|x| x.ok()), Some(Some(("ABC", "12.3"))));
assert_eq!(pairs.next().map(|x| x.ok()), None)
}
}