git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
6f6f524
)
Bugfix: Check that QRcode_encodeString didn't return NULL (error)
author
Luke Dashjr
<luke-jr+git@utopios.org>
Sun, 15 Apr 2012 01:00:27 +0000 (21:00 -0400)
committer
Luke Dashjr
<luke-jr+git@utopios.org>
Sun, 15 Apr 2012 01:00:27 +0000 (21:00 -0400)
Without this, any error will segfault Bitcoin-Qt
src/qt/qrcodedialog.cpp
patch
|
blob
|
history
diff --git
a/src/qt/qrcodedialog.cpp
b/src/qt/qrcodedialog.cpp
index
9965f14
..
2a428fb
100644
(file)
--- a/
src/qt/qrcodedialog.cpp
+++ b/
src/qt/qrcodedialog.cpp
@@
-41,6
+41,11
@@
void QRCodeDialog::genCode()
ui->lblQRCode->setText("");
QRcode *code = QRcode_encodeString(uri.toUtf8().constData(), 0, QR_ECLEVEL_L, QR_MODE_8, 1);
+ if (!code)
+ {
+ ui->lblQRCode->setText(tr("Error encoding URI into QR Code."));
+ return;
+ }
myImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32);
myImage.fill(0xffffff);
unsigned char *p = code->data;