summary refs log tree commit diff stats
path: root/ui
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2012-08-13 10:32:32 +0200
committerGerd Hoffmann <kraxel@redhat.com>2012-09-05 17:11:55 +0200
commit835cab85ad83ed8dfe1c13243aeda5959b153e3e (patch)
tree29662388720550a5aad486978aa52840a12cdabe /ui
parent8db972cfa469b4e4afd9c65e54e796b83b5ce3a2 (diff)
downloadfocaccia-qemu-835cab85ad83ed8dfe1c13243aeda5959b153e3e.tar.gz
focaccia-qemu-835cab85ad83ed8dfe1c13243aeda5959b153e3e.zip
spice: abort on invalid streaming cmdline params
When parsing its command line parameters, spice aborts when it
finds unexpected values, except for the 'streaming-video' option.
This happens because the parsing of the parameters for this option
is done using the 'name2enum' helper, which does not error out
on unknown values. Using the 'parse_name' helper makes sure we
error out in this case. Looking at git history, the use of
'name2enum' instead of 'parse_name' seems to have been an oversight,
so let's change to that now.

Fixes rhbz#831708

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/spice-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 4fc48f8902..bb4f58584a 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -344,7 +344,8 @@ static const char *stream_video_names[] = {
     [ SPICE_STREAM_VIDEO_FILTER ] = "filter",
 };
 #define parse_stream_video(_name) \
-    name2enum(_name, stream_video_names, ARRAY_SIZE(stream_video_names))
+    parse_name(_name, "stream video control", \
+               stream_video_names, ARRAY_SIZE(stream_video_names))
 
 static const char *compression_names[] = {
     [ SPICE_IMAGE_COMPRESS_OFF ]      = "off",