[rygel] renderer: Correctly escape state variable values



commit 8a0a0b1002fe6d2b67d4f2b1e1bd940de4f6f360
Author: Milan Plzik <milan plzik streamunlimited com>
Date:   Wed Dec 3 16:22:47 2014 +0100

    renderer: Correctly escape state variable values
    
    Signed-off-by: Milan Plzik <milan plzik streamunlimited com>

 src/librygel-renderer/rygel-av-transport.vala |    9 +++------
 src/librygel-renderer/rygel-changelog.vala    |    7 ++++---
 2 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/src/librygel-renderer/rygel-av-transport.vala b/src/librygel-renderer/rygel-av-transport.vala
index 7d2d252..8a13d53 100644
--- a/src/librygel-renderer/rygel-av-transport.vala
+++ b/src/librygel-renderer/rygel-av-transport.vala
@@ -163,14 +163,11 @@ internal class Rygel.AVTransport : Service {
         log.log ("CurrentTrackDuration",         this.player.duration_as_str);
         log.log ("CurrentMediaDuration",         this.player.duration_as_str);
         log.log ("AVTransportURI",               this.controller.uri);
-        log.log ("AVTransportURIMetaData",
-                 Markup.escape_text (this.controller.metadata));
+        log.log ("AVTransportURIMetaData",       this.controller.metadata);
         log.log ("CurrentTrackURI",              this.controller.track_uri);
-        log.log ("CurrentTrackMetaData",
-                 Markup.escape_text (this.controller.track_metadata));
+        log.log ("CurrentTrackMetaData",         this.controller.track_metadata);
         log.log ("NextAVTransportURI",           this.controller.next_uri);
-        log.log ("NextAVTransportURIMetaData",
-                 Markup.escape_text (this.controller.next_metadata));
+        log.log ("NextAVTransportURIMetaData",   this.controller.next_metadata);
 
         value.init (typeof (string));
         value.set_string (log.finish ());
diff --git a/src/librygel-renderer/rygel-changelog.vala b/src/librygel-renderer/rygel-changelog.vala
index 00f4763..6f54c92 100644
--- a/src/librygel-renderer/rygel-changelog.vala
+++ b/src/librygel-renderer/rygel-changelog.vala
@@ -72,7 +72,8 @@ internal class Rygel.ChangeLog : Object {
 
     public void log (string variable, string value) {
         debug (@"'%s = %s' logged", variable, value);
-        this.hash.set (variable, "<%s val=\"%s\"/>".printf (variable, value));
+        this.hash.set (variable, "<%s val=\"%s\"/>".printf (variable,
+                                                            Markup.escape_text(value)));
 
         this.ensure_timeout ();
     }
@@ -82,8 +83,8 @@ internal class Rygel.ChangeLog : Object {
                                   string channel) {
         this.hash.set (variable,
                        "<%s val=\"%s\" channel=\"%s\"/>".printf (variable,
-                                                                 value,
-                                                                 channel));
+                                                                 Markup.escape_text(value),
+                                                                 Markup.escape_text(channel)));
 
         this.ensure_timeout ();
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]