Merge 9307c588d0 into merged_master (Bitcoin PR #21293)

This commit is contained in:
Andrew Poelstra 2021-06-25 02:44:43 +00:00
commit 9acd1fc4e8

View file

@ -63,7 +63,7 @@ static std::map<std::string, unsigned int> mapFlagNames = {
unsigned int ParseScriptFlags(std::string strFlags)
{
if (strFlags.empty() | strFlags == "NONE") return 0;
if (strFlags.empty() || strFlags == "NONE") return 0;
unsigned int flags = 0;
std::vector<std::string> words;
boost::algorithm::split(words, strFlags, boost::algorithm::is_any_of(","));