github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 6.x

Browse Source
This commit is contained in:
Benoit Blanchon
2018-06-04 17:44:10 +02:00
parent fc2e3a4ab3 011aac43d2
commit 0139354780
12 changed files with 104 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ArduinoJson/Strings/StdString.hpp
View File

@@ -36,7 +36,10 @@ struct StdStringTraits {
}
static bool equals(const TString& str, const char* expected) {
return 0 == strcmp(str.c_str(), expected);
// Arduino's String::c_str() can return NULL
const char* actual = str.c_str();
if (!actual || !expected) return actual == expected;
return 0 == strcmp(actual, expected);
}
static void append(TString& str, char c) {
@@ -64,7 +67,7 @@ struct StringTraits<StringSumHelper, void> : StdStringTraits<StringSumHelper> {
template <>
struct StringTraits<std::string, void> : StdStringTraits<std::string> {};
#endif
}
}
} // namespace Internals
} // namespace ArduinoJson
#endif