Skip to content

Commit 17707db

Browse files
committed
Fix maybe-uninitialized warning in IsSpentKey
1 parent bc87ad9 commit 17707db

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

src/wallet/wallet.cpp

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,21 +1039,20 @@ bool CWallet::IsSpentKey(const CScript& scriptPubKey) const
10391039
return true;
10401040
}
10411041

1042-
LegacyScriptPubKeyMan* spk_man = GetLegacyScriptPubKeyMan();
1043-
if (!spk_man) return false;
1044-
1045-
for (const auto& keyid : GetAffectedKeys(scriptPubKey, *spk_man)) {
1046-
WitnessV0KeyHash wpkh_dest(keyid);
1047-
if (IsAddressPreviouslySpent(wpkh_dest)) {
1048-
return true;
1049-
}
1050-
ScriptHash sh_wpkh_dest(GetScriptForDestination(wpkh_dest));
1051-
if (IsAddressPreviouslySpent(sh_wpkh_dest)) {
1052-
return true;
1053-
}
1054-
PKHash pkh_dest(keyid);
1055-
if (IsAddressPreviouslySpent(pkh_dest)) {
1056-
return true;
1042+
if (LegacyScriptPubKeyMan* spk_man = GetLegacyScriptPubKeyMan()) {
1043+
for (const auto& keyid : GetAffectedKeys(scriptPubKey, *spk_man)) {
1044+
WitnessV0KeyHash wpkh_dest(keyid);
1045+
if (IsAddressPreviouslySpent(wpkh_dest)) {
1046+
return true;
1047+
}
1048+
ScriptHash sh_wpkh_dest(GetScriptForDestination(wpkh_dest));
1049+
if (IsAddressPreviouslySpent(sh_wpkh_dest)) {
1050+
return true;
1051+
}
1052+
PKHash pkh_dest(keyid);
1053+
if (IsAddressPreviouslySpent(pkh_dest)) {
1054+
return true;
1055+
}
10571056
}
10581057
}
10591058
return false;

0 commit comments

Comments
 (0)