Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-07 17:06:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(param): split params only on \n

Browse Source 
str.lines() splits on both \n and \r\n
We use \n as a field separator,
so \r\n should not separate the fields.
This commit is contained in:
link2xt
2025-09-10 23:34:54 +00:00
committed by l
parent b9ff40c6b5
commit b181d78dd5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/param.rs
View File

@@ -265,7 +265,7 @@ impl str::FromStr for Params {
/// or from an upgrade (when a key is dropped but was used in the past) /// or from an upgrade (when a key is dropped but was used in the past)
fn from_str(s: &str) -> std::result::Result<Self, Self::Err> { fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
let mut inner = BTreeMap::new(); let mut inner = BTreeMap::new();
let mut lines = s.lines().peekable(); let mut lines = s.split('\n').peekable();
while let Some(line) = lines.next() { while let Some(line) = lines.next() {
if let [key, value] = line.splitn(2, '=').collect::<Vec<_>>()[..] { if let [key, value] = line.splitn(2, '=').collect::<Vec<_>>()[..] {
@@ -457,6 +457,7 @@ mod tests {
let mut params = Params::new(); let mut params = Params::new();
params.set(Param::Height, "foo\nbar=baz\nquux"); params.set(Param::Height, "foo\nbar=baz\nquux");
params.set(Param::Width, "\n\n\na=\n="); params.set(Param::Width, "\n\n\na=\n=");
params.set(Param::WebrtcRoom, "foo\r\nbar\r\n\r\nbaz\r\n");
assert_eq!(params.to_string().parse::<Params>().unwrap(), params); assert_eq!(params.to_string().parse::<Params>().unwrap(), params);
} }