Merge branch 'develop' into crypto

alethzero/MainWin.cpp

@@ -134,6 +134,8 @@ Main::Main(QWidget *parent) :
 
 	connect(ui->webView, &QWebView::loadStarted, [this]()
 	{
+		m_ethereum = nullptr;
+		m_whisper = nullptr;
 		// NOTE: no need to delete as QETH_INSTALL_JS_NAMESPACE adopts it.
 		m_dev = new QDev(this);
 		m_ethereum = new QEthereum(this, ethereum(), owned());
@@ -564,6 +566,8 @@ void Main::readSettings(bool _skipGeometry)
 	m_enableOptimizer = s.value("enableOptimizer", true).toBool();
 	ui->enableOptimizer->setChecked(m_enableOptimizer);
 	ui->clientName->setText(s.value("clientName", "").toString());
+	if (ui->clientName->text().isEmpty())
+		ui->clientName->setText(QInputDialog::getText(this, "Enter identity", "Enter a name that will identify you on the peer network"));
 	ui->idealPeers->setValue(s.value("idealPeers", ui->idealPeers->value()).toInt());
 	ui->port->setValue(s.value("port", ui->port->value()).toInt());
 	ui->nameReg->setText(s.value("nameReg", "").toString());

libwhisper/Message.cpp

@@ -48,7 +48,7 @@ bool Message::populate(bytes const& _data)
 		return false;
 
 	byte flags = _data[0];
-	if (!!(flags & ContainsSignature) && _data.size() > sizeof(Signature) + 1)	// has a signature
+	if (!!(flags & ContainsSignature) && _data.size() >= sizeof(Signature) + 1)	// has a signature
 	{
 		bytesConstRef payload = bytesConstRef(&_data).cropped(1, _data.size() - sizeof(Signature) - 1);
 		h256 h = sha3(payload);