Attachment 211861 Details for Bug 313141 – Patch to fix avahi names that are > 64 bytes

[patch] Patch to fix avahi names that are > 64 bytes

pulseaudio-0.9.6-truncate-avahi-names.patch (text/plain), 2.45 KB, created by Jonathan Dieter on 2007-09-30 16:35:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Dieter

Created: 2007-09-30 16:35:57 UTC

Size: 2.45 KB

patch

obsolete

>diff -ur pulseaudio-0.9.6b/src/modules/module-zeroconf-publish.c pulseaudio-0.9.6a/src/modules/module-zeroconf-publish.c
>--- pulseaudio-0.9.6b/src/modules/module-zeroconf-publish.c	2007-05-13 02:21:39.000000000 +0300
>+++ pulseaudio-0.9.6a/src/modules/module-zeroconf-publish.c	2007-09-30 18:50:46.000000000 +0300
>@@ -34,6 +34,7 @@
> #include <avahi-client/client.h>
> #include <avahi-client/publish.h>
> #include <avahi-common/alternative.h>
>+#include <avahi-common/domain.h>
> #include <avahi-common/error.h>
> 
> #include <pulse/xmalloc.h>
>@@ -255,7 +256,7 @@
>     s->published = UNPUBLISHED;
>     s->name = pa_xstrdup(name);
>     s->loaded.valid = s->autoload.valid = 0;
>-    s->service_name = pa_sprintf_malloc("%s on %s", description ? description : s->name, pa_get_host_name(hn, sizeof(hn)));
>+    s->service_name = pa_truncate_utf8(pa_sprintf_malloc("%s on %s", description ? description : s->name, pa_get_host_name(hn, sizeof(hn))), AVAHI_LABEL_MAX-1);
> 
>     pa_hashmap_put(u->services, s->name, s);
> 
>@@ -622,7 +623,7 @@
> 
>     u->main_entry_group = NULL;
> 
>-    u->service_name = pa_xstrdup(pa_get_host_name(hn, sizeof(hn)));
>+    u->service_name = pa_truncate_utf8(pa_xstrdup(pa_get_host_name(hn, sizeof(hn))), AVAHI_LABEL_MAX-1);
> 
>     if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) {
>         pa_log("pa_avahi_client_new() failed: %s", avahi_strerror(error));
>diff -ur pulseaudio-0.9.6b/src/pulsecore/core-util.c pulseaudio-0.9.6a/src/pulsecore/core-util.c
>--- pulseaudio-0.9.6b/src/pulsecore/core-util.c	2007-05-25 23:35:33.000000000 +0300
>+++ pulseaudio-0.9.6a/src/pulsecore/core-util.c	2007-09-30 18:34:30.000000000 +0300
>@@ -1198,3 +1198,20 @@
> 
>     return 0;
> }
>+
>+/* Truncate the specified string, but guarantee that the string
>+ *  * returned still validates as UTF8 */
>+char *pa_truncate_utf8(char *c, size_t l) {
>+    assert(c);
>+    assert(pa_utf8_valid(c));
>+
>+    if (strlen(c) <= l)
>+        return c;
>+
>+    c[l] = 0;
>+
>+    while (l > 0 && !pa_utf8_valid(c))
>+        c[--l] = 0;
>+
>+    return c;
>+}
>diff -ur pulseaudio-0.9.6b/src/pulsecore/core-util.h pulseaudio-0.9.6a/src/pulsecore/core-util.h
>--- pulseaudio-0.9.6b/src/pulsecore/core-util.h	2007-05-13 02:21:38.000000000 +0300
>+++ pulseaudio-0.9.6a/src/pulsecore/core-util.h	2007-09-30 18:34:55.000000000 +0300
>@@ -91,5 +91,6 @@
> 
> int pa_atoi(const char *s, int32_t *ret_i);
> int pa_atou(const char *s, uint32_t *ret_u);
>+char *pa_truncate_utf8(char *c, size_t l);
> 
> #endif

Actions: View | Diff

Attachments on bug 313141: 211861 | 211871