]> code.delx.au - pulseaudio/commitdiff
raop: Properly deal with the name coming from the device.
authorColin Guthrie <colin@mageia.org>
Tue, 6 Sep 2011 10:45:24 +0000 (11:45 +0100)
committerColin Guthrie <colin@mageia.org>
Fri, 9 Sep 2011 18:51:02 +0000 (19:51 +0100)
We need to properly quote our proplist arguments passed to the module.

src/modules/raop/module-raop-discover.c

index 1a7572c181f4e7086c93889434e0da87a78c85f1..4ebe5fc791a8103aa37b469a909af8ed01466a2a 100644 (file)
@@ -156,7 +156,9 @@ static void resolver_cb(
             ++nicename;
             if (strlen(nicename) > 0) {
                 pa_log_debug("Found RAOP: %s", nicename);
-            }
+                nicename = pa_escape(nicename, "\"'");
+            } else
+                nicename = NULL;
         }
 
         for (l = txt; l; l = l->next) {
@@ -189,11 +191,11 @@ static void resolver_cb(
         if (nicename) {
             args = pa_sprintf_malloc("server=[%s]:%u "
                                      "sink_name=%s "
-                                     "sink_properties=device.description=\"%s\"",
+                                     "sink_properties='device.description=\"%s\"'",
                                      avahi_address_snprint(at, sizeof(at), a), port,
                                      vname,
                                      nicename);
-
+            pa_xfree(nicename);
         } else {
             args = pa_sprintf_malloc("server=[%s]:%u "
                                      "sink_name=%s",