openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qapi: Fix string-input-visitor to reject NaN and infinities 

The string-input-visitor happily accepts NaN and infinities when parsing
numbers (doubles). They shouldn't. Fix that.

Also, add two test cases, testing if "NaN" and "inf" is properly
rejected.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20181121164421.20780-4-david@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
David Hildenbrand 2018-11-21 17:44:15 +01:00 committed by Markus Armbruster
parent af02f4c517
commit 4b69d4c3d7
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qapi/string-input-visitor.c
View File

@ -20,6 +20,7 @@
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qemu/range.h" #include "qemu/range.h"
#include "qemu/cutils.h"
struct StringInputVisitor struct StringInputVisitor
@ -313,12 +314,9 @@ static void parse_type_number(Visitor *v, const char *name, double *obj,
Error **errp) Error **errp)
{ {
StringInputVisitor *siv = to_siv(v); StringInputVisitor *siv = to_siv(v);
char *endp = (char *) siv->string;
double val; double val;
errno = 0; if (qemu_strtod_finite(siv->string, NULL, &val)) {
val = strtod(siv->string, &endp);
if (errno || endp == siv->string || *endp) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"number"); "number");
return; return;

13
tests/test-string-input-visitor.c
View File

@ -252,6 +252,19 @@ static void test_visitor_in_number(TestInputVisitorData *data,
visit_type_number(v, NULL, &res, &err); visit_type_number(v, NULL, &res, &err);
g_assert(!err); g_assert(!err);
g_assert_cmpfloat(res, ==, value); g_assert_cmpfloat(res, ==, value);
/* NaN and infinity has to be rejected */
v = visitor_input_test_init(data, "NaN");
visit_type_number(v, NULL, &res, &err);
error_free_or_abort(&err);
v = visitor_input_test_init(data, "inf");
visit_type_number(v, NULL, &res, &err);
error_free_or_abort(&err);
} }
static void test_visitor_in_string(TestInputVisitorData *data, static void test_visitor_in_string(TestInputVisitorData *data,