BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C++: Catch exceptions from stoi() and stod(). 

Fixes bug #483.
This commit is contained in:
Martin Ling 2015-10-25 23:30:49 +00:00 committed by Daniel Elstner
parent 90bd8829b1
commit 4aa9a1e569
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bindings/cxx/ConfigKey_methods.cpp
View File

@ -88,7 +88,11 @@ Glib::VariantBase ConfigKey::parse_string(string value) const
variant = g_variant_new_boolean(sr_parse_boolstring(value.c_str())); variant = g_variant_new_boolean(sr_parse_boolstring(value.c_str()));
break; break;
case SR_T_FLOAT: case SR_T_FLOAT:
variant = g_variant_new_double(stod(value)); try {
variant = g_variant_new_double(stod(value));
} catch (invalid_argument) {
throw Error(SR_ERR_ARG);
}
break; break;
case SR_T_RATIONAL_PERIOD: case SR_T_RATIONAL_PERIOD:
check(sr_parse_period(value.c_str(), &p, &q)); check(sr_parse_period(value.c_str(), &p, &q));
@ -99,7 +103,11 @@ Glib::VariantBase ConfigKey::parse_string(string value) const
variant = g_variant_new("(tt)", p, q); variant = g_variant_new("(tt)", p, q);
break; break;
case SR_T_INT32: case SR_T_INT32:
variant = g_variant_new_int32(stoi(value)); try {
variant = g_variant_new_int32(stoi(value));
} catch (invalid_argument) {
throw Error(SR_ERR_ARG);
}
break; break;
default: default:
throw Error(SR_ERR_BUG); throw Error(SR_ERR_BUG);