2 files changed, 15 insertions, 5 deletions
diff --git a/src/common/utf8.c b/src/common/utf8.c
index 7f2e6f1..1d4cf13 100644
--- a/src/common/utf8.c
+++ b/src/common/utf8.c
@@ -54,10 +54,17 @@ bool yasl_utf8_validate(const char *str, size_t len)
 
 char *yasl_utf8_sanitize_dup(const char *str)
 {
-    if (!str) return NULL;
+    if (unlikely(!str)) return NULL;
     size_t len = strlen(str);
+    if (likely(yasl_utf8_validate(str, len))) {
+        char *out = malloc(len + 1);
+        if (unlikely(!out)) return NULL;
+        memcpy(out, str, len + 1);
+        return out;
+    }
+
     char *out = malloc(len + 1);
-    if (!out) return NULL;
+    if (unlikely(!out)) return NULL;
 
     const unsigned char *p = (const unsigned char *)str;
     size_t o = 0;
diff --git a/src/wayland/clipboard.c b/src/wayland/clipboard.c
index 324644f..0e6ce33 100644
--- a/src/wayland/clipboard.c
+++ b/src/wayland/clipboard.c
@@ -170,9 +170,12 @@ static struct transfer *start_transfer(struct clipboard *c, int fd, bool sending
 
 static const char *match_text_mime(const char *mime)
 {
-    if (!strcasecmp(mime, "text/plain;charset=utf-8")) return "text/plain;charset=utf-8";
-    if (!strcasecmp(mime, "text/plain;charset=utf8")) return "text/plain;charset=utf8";
-    if (!strcasecmp(mime, "text/plain")) return "text/plain";
+    if (unlikely(!mime)) return NULL;
+    if (likely(!strncasecmp(mime, "text/plain", 10))) {
+        if (!strcasecmp(mime, "text/plain;charset=utf-8")) return "text/plain;charset=utf-8";
+        if (!strcasecmp(mime, "text/plain;charset=utf8")) return "text/plain;charset=utf8";
+        if (!strcasecmp(mime, "text/plain")) return "text/plain";
+    }
     if (!strcasecmp(mime, "UTF8_STRING")) return "UTF8_STRING";
     if (!strcasecmp(mime, "STRING")) return "STRING";
     if (!strcasecmp(mime, "TEXT")) return "TEXT";