Skip to content

Commit aaab5fb

Browse files
committed
Merge #806: refactor: Misc int sign change fixes
0541642 refactor: Avoid implicit-integer-sign-change in processNewTransaction (MarcoFalke) 321f105 refactor: Avoid implicit-signed-integer-truncation-or-sign-change in FreedesktopImage (MarcoFalke) 6d8eecd refactor: Avoid implicit-integer-sign-change in createTransaction (MarcoFalke) Pull request description: This is allowed by the language. However, the `integer` sanitizer complains about it. Thus, fix it, so that the `integer` sanitizer can be used in the future to catch unintended sign changes. Fixes #805. ACKs for top commit: pablomartin4btc: tACK 0541642 hebasto: ACK 0541642, I have reviewed the code and it looks OK. Tree-SHA512: eaa941479bd7bee196eb8b31d93b8e1db122410cf62e8ec4cbbec35cfd14cc766081c3df5dd14a228e21ad2678d8b8ba0d2649e5934c994a90ae96d8b264b4ce
2 parents dbd2000 + 0541642 commit aaab5fb

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/qt/notificator.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ FreedesktopImage::FreedesktopImage(const QImage &img):
112112

113113
for(unsigned int ptr = 0; ptr < num_pixels; ++ptr)
114114
{
115-
image[ptr*BYTES_PER_PIXEL+0] = data[ptr] >> 16; // R
116-
image[ptr*BYTES_PER_PIXEL+1] = data[ptr] >> 8; // G
117-
image[ptr*BYTES_PER_PIXEL+2] = data[ptr]; // B
118-
image[ptr*BYTES_PER_PIXEL+3] = data[ptr] >> 24; // A
115+
image[ptr * BYTES_PER_PIXEL + 0] = char(data[ptr] >> 16); // R
116+
image[ptr * BYTES_PER_PIXEL + 1] = char(data[ptr] >> 8); // G
117+
image[ptr * BYTES_PER_PIXEL + 2] = char(data[ptr]); // B
118+
image[ptr * BYTES_PER_PIXEL + 3] = char(data[ptr] >> 24); // A
119119
}
120120
}
121121

src/qt/walletview.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ void WalletView::processNewTransaction(const QModelIndex& parent, int start, int
134134
return;
135135

136136
QString date = ttm->index(start, TransactionTableModel::Date, parent).data().toString();
137-
qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent).data(Qt::EditRole).toULongLong();
137+
qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent).data(Qt::EditRole).toLongLong();
138138
QString type = ttm->index(start, TransactionTableModel::Type, parent).data().toString();
139139
QModelIndex index = ttm->index(start, 0, parent);
140140
QString address = ttm->data(index, TransactionTableModel::AddressRole).toString();

src/wallet/interfaces.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ class WalletImpl : public Wallet
286286
if (!res) return util::Error{util::ErrorString(res)};
287287
const auto& txr = *res;
288288
fee = txr.fee;
289-
change_pos = txr.change_pos ? *txr.change_pos : -1;
289+
change_pos = txr.change_pos ? int(*txr.change_pos) : -1;
290290

291291
return txr.tx;
292292
}

0 commit comments

Comments
 (0)