shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-16 09:57:26 +03:00
Code

sd-bus: refuse to send messages with an invalid string

Browse Source 
Prompted by aaf7b0e41105d7b7cf30912cdac32820f011a219 and
4804da58536ab7ad46178a03f4d2da49fd8e4ba2.

(cherry picked from commit 26a9dd6f55bb757e0033995cbb16bca12986b7cd)
(cherry picked from commit 7394a756882aa4b4917c8128c1c29723b4208ab5)
This commit is contained in:
Yu Watanabe 2023-05-19 04:33:39 +09:00 committed by Luca Boccassi
parent 03c270fa6b
commit 8e5c4a6925
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libsystemd/sd-bus/bus-message.c
View File

@ -1324,12 +1324,21 @@ int message_append_basic(sd_bus_message *m, char type, const void *p, const void
* into the empty string */
p = strempty(p);
_fallthrough_;
if (!utf8_is_valid(p))
return -EINVAL;
align = 4;
sz = 4 + strlen(p) + 1;
break;
case SD_BUS_TYPE_OBJECT_PATH:
if (!p)
return -EINVAL;
if (!object_path_is_valid(p))
return -EINVAL;
align = 4;
sz = 4 + strlen(p) + 1;
break;
@ -1338,6 +1347,9 @@ int message_append_basic(sd_bus_message *m, char type, const void *p, const void
p = strempty(p);
if (!signature_is_valid(p, /* allow_dict_entry = */ true))
return -EINVAL;
align = 1;
sz = 1 + strlen(p) + 1;
break;