diff options
author | fanquake <fanquake@gmail.com> | 2022-12-23 12:58:04 +0000 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2022-12-23 13:02:22 +0000 |
commit | 0da38b6b0e74ee4479553d2bf611593fa51d54b3 (patch) | |
tree | a4051e7eb2c18b941fac78d5f11e90e2414901a9 | |
parent | b3f866a8dfd652b6339b79124843e58bd0bf3013 (diff) | |
parent | 0662105e884dce3eae9d3eb0b0d49600c1260b90 (diff) |
Merge bitcoin/bitcoin#26735: [24.x] qt: Load PSBTs using istreambuf_iterator rather than istream_iterator
0662105e884dce3eae9d3eb0b0d49600c1260b90 qt: Load PSBTs using istreambuf_iterator rather than istream_iterator (Andrew Chow)
Pull request description:
ACKs for top commit:
fanquake:
ACK 0662105e884dce3eae9d3eb0b0d49600c1260b90
Tree-SHA512: 6a2ee4d2150bf3d90e95325966d4f73b05f8cb1a5af1db6a64c891880b9f3a0846d59eb6896fee80a63b05f2084bfadc64cf9a9029598c3b31ce104715a0ca81
-rw-r--r-- | src/qt/walletframe.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index 8dc97e66a2..adc7793916 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -212,7 +212,7 @@ void WalletFrame::gotoLoadPSBT(bool from_clipboard) return; } std::ifstream in{filename.toLocal8Bit().data(), std::ios::binary}; - data.assign(std::istream_iterator<unsigned char>{in}, {}); + data.assign(std::istreambuf_iterator<char>{in}, {}); // Some psbt files may be base64 strings in the file rather than binary data std::string b64_str{data.begin(), data.end()}; |