Merge pull request #1100 from luke-jr/qrcode_errchk

Bugfix: Check that QRcode_encodeString didn't return NULL (error)

1 files changed, 5 insertions, 0 deletions

diff --git a/src/qt/qrcodedialog.cpp b/src/qt/qrcodedialog.cpp
index 9965f1438f..2a428fb79e 100644
--- 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;