rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

Fix infinite recursion in Structure::to_string()

Browse source 
Instead of StructureRef's to_string(), we were calling
ToString::to_string() in the Display impl. Which then called into itself
again.

Fixes https://github.com/sdroege/gstreamer-rs/issues/101
This commit is contained in:
Sebastian Dröge 2018-04-06 13:16:47 +03:00
parent c5617f6a47
commit f346d57b4f
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gstreamer/src/structure.rs
View file

@ -121,13 +121,15 @@ impl Drop for Structure {
impl fmt::Debug for Structure { impl fmt::Debug for Structure {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.debug_tuple("Structure").field(&self.to_string()).finish() f.debug_tuple("Structure")
.field(&self.as_ref().to_string())
.finish()
} }
} }
impl fmt::Display for Structure { impl fmt::Display for Structure {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str(&self.to_string()) f.write_str(&self.as_ref().to_string())
} }
} }
@ -506,7 +508,7 @@ impl StructureRef {
impl fmt::Debug for StructureRef { impl fmt::Debug for StructureRef {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str(&self.to_string()) f.write_str(&StructureRef::to_string(self))
} }
} }
@ -697,7 +699,7 @@ mod tests {
#[test] #[test]
fn test_string_conversion() { fn test_string_conversion() {
let a = "Test, f1=(string)abc, f2=(uint)123"; let a = "Test, f1=(string)abc, f2=(uint)123;";
let s = Structure::from_string(&a).unwrap(); let s = Structure::from_string(&a).unwrap();
assert_eq!(s.get::<&str>("f1").unwrap(), "abc"); assert_eq!(s.get::<&str>("f1").unwrap(), "abc");