X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Falternative.c;h=6ff9c355f09ebb8f57c2cb0ff621ca2276264d87;hb=7289ee4063da05f276bce22685312baa83f0f117;hp=c9a0f48ac73a7c04fa245dbeceda6a73de35a6c2;hpb=c5544522f6409095627dc3d1129560195ab4ec40;p=catta

diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c
index c9a0f48..6ff9c35 100644
--- a/avahi-common/alternative.c
+++ b/avahi-common/alternative.c
@@ -26,39 +26,107 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <assert.h>
 
 #include "alternative.h"
+#include "malloc.h"
+#include "domain.h"
+#include "utf8.h"
 
-gchar * avahi_alternative_host_name(const gchar *s) {
-    const gchar *p, *e = NULL;
-    gchar *c, *r;
-    gint n;
+static void drop_incomplete_utf8(char *c) {
+    char *e;
 
-    g_assert(s);
+    e = strchr(c, 0) - 1;
     
-    for (p = s; *p; p++)
-        if (!isdigit(*p))
-            e = p+1;
+    while (e >= c) {
 
-    if (e && *e)
-        n = atoi(e)+1;
-    else
-        n = 2;
+        if (avahi_utf8_valid(c))
+            break;
+        
+        assert(*e & 128);
+        *e = 0;
+
+        e--;
+    }
+}
+
+char *avahi_alternative_host_name(const char *s) {
+    const char *e;
+    char *r;
+
+    assert(s);
 
-    c = e ? g_strndup(s, e-s) : g_strdup(s);
-    r = g_strdup_printf("%s%i", c, n);
-    g_free(c);
+    if (!avahi_is_valid_host_name(s))
+        return NULL;
     
+    if ((e = strrchr(s, '-'))) {
+        const char *p;
+
+        e++;
+        
+        for (p = e; *p; p++)
+            if (!isdigit(*p)) {
+                e = NULL;
+                break;
+            }
+
+        if (e && (*e == '0' || *e == 0))
+            e = NULL;
+    }
+
+    if (e) {
+        char *c, *m;
+        size_t l;
+        int n;
+
+        n = atoi(e)+1;
+        if (!(m = avahi_strdup_printf("%i", n)))
+            return NULL;
+
+        l = e-s-1;
+
+        if (l >= AVAHI_LABEL_MAX-1-strlen(m)-1)
+            l = AVAHI_LABEL_MAX-1-strlen(m)-1;
+
+        if (!(c = avahi_strndup(s, l))) {
+            avahi_free(m);
+            return NULL;
+        }
+
+        drop_incomplete_utf8(c);
+        
+        r = avahi_strdup_printf("%s-%s", c, m);
+        avahi_free(c);
+        avahi_free(m);
+        
+    } else {
+        char *c;
+
+        if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-2)))
+            return NULL;
+
+        drop_incomplete_utf8(c);
+        
+        r = avahi_strdup_printf("%s-2", c);
+        avahi_free(c);
+    }
+
+    assert(avahi_is_valid_host_name(r));
+
     return r;
-    
 }
 
-gchar *avahi_alternative_service_name(const gchar *s) {
-    const gchar *e;
-    g_assert(s);
+char *avahi_alternative_service_name(const char *s) {
+    const char *e;
+    char *r;
+
+    assert(s);
 
+    if (!avahi_is_valid_service_name(s))
+        return NULL;
+    
     if ((e = strstr(s, " #"))) {
-        const gchar *n, *p;
+        const char *n, *p;
         e += 2;
     
         while ((n = strstr(e, " #")))
@@ -69,13 +137,48 @@ gchar *avahi_alternative_service_name(const gchar *s) {
                 e = NULL;
                 break;
             }
+
+        if (e && (*e == '0' || *e == 0))
+            e = NULL;
     }
     
     if (e) {
-        gchar *r, *c = g_strndup(s, e-s);
-        r = g_strdup_printf("%s%i", c, atoi(e)+1);
-        g_free(c);
-        return r;
-    } else
-        return g_strdup_printf("%s #2", s);
+        char *c, *m;
+        size_t l;
+        int n;
+
+        n = atoi(e)+1;
+        if (!(m = avahi_strdup_printf("%i", n)))
+            return NULL;
+
+        l = e-s-2;
+
+        if (l >= AVAHI_LABEL_MAX-1-strlen(m)-2)
+            l = AVAHI_LABEL_MAX-1-strlen(m)-2;
+
+        if (!(c = avahi_strndup(s, l))) {
+            avahi_free(m);
+            return NULL;
+        }
+
+        drop_incomplete_utf8(c);
+        
+        r = avahi_strdup_printf("%s #%s", c, m);
+        avahi_free(c);
+        avahi_free(m);
+    } else {
+        char *c;
+
+        if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-3)))
+            return NULL;
+        
+        drop_incomplete_utf8(c);
+        
+        r = avahi_strdup_printf("%s #2", c);
+        avahi_free(c);
+    }
+
+    assert(avahi_is_valid_service_name(r));
+    
+    return r;
 }