From 3be80622efacd303b68482ef84aa426b79452185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Tue, 12 Jan 2021 14:56:47 +0100 Subject: [PATCH] selection: uri decode: move zero-length check into decode_one_uri() --- selection.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/selection.c b/selection.c index b9b086a8..de8b06e7 100644 --- a/selection.c +++ b/selection.c @@ -1490,6 +1490,9 @@ decode_one_uri(struct clipboard_receive *ctx, char *uri, size_t len) { LOG_DBG("URI: \"%.*s\"", (int)len, uri); + if (len == 0) + return false; + char *scheme, *host, *path; if (!uri_parse(uri, len, &scheme, NULL, NULL, &host, NULL, &path, NULL, NULL)) { LOG_ERR("drag-and-drop: invalid URI: %.*s", (int)len, uri); @@ -1544,8 +1547,7 @@ static void fdm_receive_finish_uri(struct clipboard_receive *ctx) { LOG_DBG("finish: %.*s", (int)ctx->buf.idx, ctx->buf.data); - if (ctx->buf.idx > 0) - decode_one_uri(ctx, ctx->buf.data, ctx->buf.idx); + decode_one_uri(ctx, ctx->buf.data, ctx->buf.idx); } static bool