mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-03-29 07:58:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

combine-stream: check module arguments for syntax errors

Browse source 
Refuse to create module if the arguments were not properly parsed.
This commit is contained in:
Pauli Virtanen 2024-04-13 20:04:59 +03:00
parent cd166ac899
commit e1849a0650
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-combine-stream.c
View file

@ -21,6 +21,7 @@
#include <spa/utils/json.h> #include <spa/utils/json.h>
#include <spa/utils/ringbuffer.h> #include <spa/utils/ringbuffer.h>
#include <spa/debug/types.h> #include <spa/debug/types.h>
#include <spa/debug/log.h>
#include <spa/pod/builder.h> #include <spa/pod/builder.h>
#include <spa/param/audio/format-utils.h> #include <spa/param/audio/format-utils.h>
#include <spa/param/audio/raw.h> #include <spa/param/audio/raw.h>
@ -1439,6 +1440,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
struct impl *impl; struct impl *impl;
const char *str, *prefix; const char *str, *prefix;
int res; int res;
struct spa_error_location loc = {};
PW_LOG_TOPIC_INIT(mod_topic); PW_LOG_TOPIC_INIT(mod_topic);
@ -1455,10 +1457,14 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
if (args == NULL) if (args == NULL)
args = ""; args = "";
props = pw_properties_new_string(args); props = pw_properties_new_string_checked(args, strlen(args), &loc);
if (props == NULL) { if (props == NULL) {
res = -errno; res = -errno;
pw_log_error( "can't create properties: %m"); if (loc.reason)
spa_debug_log_error_location(pw_log_get(), SPA_LOG_LEVEL_ERROR, &loc,
"invalid module arguments: %s", loc.reason);
else
pw_log_error("can't create properties: %m");
goto error; goto error;
} }
impl->props = props; impl->props = props;