mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-04 17:06:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

dialog: Decodes percent encoded URI paths returned by the xdg file portal

Browse Source
This commit is contained in:
Frank Praznik
2024-06-26 19:51:00 -04:00
parent 71200e94a8
commit 596651f13a
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/dialog/unix/SDL_portaldialog.c
View File

@@ -22,6 +22,7 @@
#include "../SDL_dialog_utils.h"
#include "../../core/linux/SDL_dbus.h"
#include "../../core/unix/SDL_uri_decode.h"
#ifdef SDL_USE_LIBDBUS
@@ -226,8 +227,6 @@ static DBusHandlerResult DBus_MessageFilter(DBusConnection *conn, DBusMessage *m
while (dbus->message_iter_get_arg_type(&uri_entry) == DBUS_TYPE_STRING)
{
const char *prefix = "file://";
const int prefix_len = 7;
const char *uri = NULL;
if (current >= length - 1) {
@@ -242,10 +241,12 @@ static DBusHandlerResult DBus_MessageFilter(DBusConnection *conn, DBusMessage *m
dbus->message_iter_get_basic(&uri_entry, &uri);
/* https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.FileChooser.html */
/* Returned paths will always start with 'file://'; truncate it */
if (SDL_strncmp(uri, prefix, prefix_len) == 0) {
path[current] = uri + prefix_len;
} else if (SDL_strstr(uri, "://")) {
/* Returned paths will always start with 'file://'; SDL_URIToLocal() truncates it. */
char *decoded_uri = SDL_malloc(SDL_strlen(uri) + 1);
if (SDL_URIToLocal(uri, decoded_uri)) {
path[current] = decoded_uri;
} else {
SDL_free(decoded_uri);
SDL_SetError("Portal dialogs: Unsupported protocol: %s", uri);
signal_data->callback(signal_data->userdata, NULL, -1);
goto cleanup;
@@ -259,6 +260,12 @@ static DBusHandlerResult DBus_MessageFilter(DBusConnection *conn, DBusMessage *m
cleanup:
dbus->connection_remove_filter(conn, &DBus_MessageFilter, signal_data);
if (path) {
for (size_t i = 0; i < length; ++i) {
SDL_free((char *)path[i]);
}
}
SDL_free(path);
SDL_free((void *)signal_data->path);
SDL_free(signal_data);