peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 04:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Throw an exception when trying to parse a negative number as an unsigned.

Browse Source 
Fixing issue 859.
This commit is contained in:
Chen
2020-05-20 00:48:22 +08:00
committed by GitHub
parent 4b98aedc16
commit d9c35b6079
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Breaking-Changes.md
View File

@@ -4,7 +4,7 @@
## HEAD ## ## HEAD ##
_none_ * Throws an exception when trying to parse a negative number as an unsigned integer.
## 0.6.0 ## ## 0.6.0 ##

4
include/yaml-cpp/node/convert.h
View File

@@ -15,6 +15,7 @@
#include <sstream> #include <sstream>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <type_traits>
#include "yaml-cpp/binary.h" #include "yaml-cpp/binary.h"
#include "yaml-cpp/node/impl.h" #include "yaml-cpp/node/impl.h"
@@ -133,6 +134,9 @@ inner_encode(const T& rhs, std::stringstream& stream){
const std::string& input = node.Scalar(); \ const std::string& input = node.Scalar(); \
std::stringstream stream(input); \ std::stringstream stream(input); \
stream.unsetf(std::ios::dec); \ stream.unsetf(std::ios::dec); \
if ((stream.peek() == '-') && std::is_unsigned<type>::value) { \
return false; \
} \
if ((stream >> std::noskipws >> rhs) && (stream >> std::ws).eof()) { \ if ((stream >> std::noskipws >> rhs) && (stream >> std::ws).eof()) { \
return true; \ return true; \
} \ } \

5
test/integration/load_node_test.cpp
View File

@@ -32,6 +32,11 @@ TEST(LoadNodeTest, NumericConversion) {
EXPECT_EQ(-std::numeric_limits<float>::infinity(), node[4].as<float>()); EXPECT_EQ(-std::numeric_limits<float>::infinity(), node[4].as<float>());
EXPECT_EQ(21, node[5].as<int>()); EXPECT_EQ(21, node[5].as<int>());
EXPECT_EQ(13, node[6].as<int>()); EXPECT_EQ(13, node[6].as<int>());
// Throw exception: convert a negative number to an unsigned number.
EXPECT_THROW(node[7].as<unsigned>(), TypedBadConversion<unsigned int>);
EXPECT_THROW(node[7].as<unsigned short>(), TypedBadConversion<unsigned short>);
EXPECT_THROW(node[7].as<unsigned long>(), TypedBadConversion<unsigned long>);
EXPECT_THROW(node[7].as<unsigned long long>(), TypedBadConversion<unsigned long long>);
} }
TEST(LoadNodeTest, Binary) { TEST(LoadNodeTest, Binary) {