potok/tinyxml2
1
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #841 from pazner/master

Browse Source 
Fix errors/warnings with hexadecimal format string in sscanf
This commit is contained in:
Lee Thomason
2020-12-30 10:17:16 -08:00
committed by GitHub
parent 1aeb57d26b d3a82c5e45
commit 8e1af3a7f9
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tinyxml2.cpp
View File

@@ -610,8 +610,17 @@ void XMLUtil::ToStr( uint64_t v, char* buffer, int bufferSize )
bool XMLUtil::ToInt(const char* str, int* value) bool XMLUtil::ToInt(const char* str, int* value)
{ {
if (TIXML_SSCANF(str, IsPrefixHex(str) ? "%x" : "%d", value) == 1) { if (IsPrefixHex(str)) {
return true; unsigned v;
if (TIXML_SSCANF(str, "%x", &v) == 1) {
*value = static_cast<int>(v);
return true;
}
}
else {
if (TIXML_SSCANF(str, "%d", value) == 1) {
return true;
}
} }
return false; return false;
} }
@@ -670,11 +679,20 @@ bool XMLUtil::ToDouble( const char* str, double* value )
bool XMLUtil::ToInt64(const char* str, int64_t* value) bool XMLUtil::ToInt64(const char* str, int64_t* value)
{ {
long long v = 0; // horrible syntax trick to make the compiler happy about %lld if (IsPrefixHex(str)) {
if (TIXML_SSCANF(str, IsPrefixHex(str) ? "%llx" : "%lld", &v) == 1) { unsigned long long v = 0; // horrible syntax trick to make the compiler happy about %llx
*value = static_cast<int64_t>(v); if (TIXML_SSCANF(str, "%llx", &v) == 1) {
return true; *value = static_cast<int64_t>(v);
} return true;
}
}
else {
long long v = 0; // horrible syntax trick to make the compiler happy about %lld
if (TIXML_SSCANF(str, "%lld", &v) == 1) {
*value = static_cast<int64_t>(v);
return true;
}
}
return false; return false;
} }