In the key related functions bufferInfo.bufferName() was used, but this
returns a null QString, which causes a segfault when processed later on,
so replace them with emtpy strings.
void CoreUserInputHandler::handleDelkey(const BufferInfo &bufferInfo, const QString &msg)
{
void CoreUserInputHandler::handleDelkey(const BufferInfo &bufferInfo, const QString &msg)
{
+ QString bufname = bufferInfo.bufferName().isNull() ? "" : bufferInfo.bufferName();
#ifdef HAVE_QCA2
if (!bufferInfo.isValid())
return;
#ifdef HAVE_QCA2
if (!bufferInfo.isValid())
return;
parms.prepend(bufferInfo.bufferName());
if (parms.isEmpty()) {
parms.prepend(bufferInfo.bufferName());
if (parms.isEmpty()) {
- emit displayMsg(Message::Info, bufferInfo.bufferName(), "",
+ emit displayMsg(Message::Info, bufname,
tr("[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."));
return;
}
tr("[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."));
return;
}
QString target = parms.at(0);
if (network()->cipherKey(target).isEmpty()) {
QString target = parms.at(0);
if (network()->cipherKey(target).isEmpty()) {
- emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("No key has been set for %1.").arg(target));
+ emit displayMsg(Message::Info, bufname, tr("No key has been set for %1.").arg(target));
return;
}
network()->setCipherKey(target, QByteArray());
return;
}
network()->setCipherKey(target, QByteArray());
- emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("The key for %1 has been deleted.").arg(target));
+ emit displayMsg(Message::Info, bufname, tr("The key for %1 has been deleted.").arg(target));
- emit displayMsg(Message::Error, bufferInfo.bufferName(), "", tr("Error: Setting an encryption key requires Quassel to have been built "
+ emit displayMsg(Message::Error, bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
"with support for the Qt Cryptographic Architecture (QCA2) library. "
"Contact your distributor about a Quassel package with QCA2 "
"support, or rebuild Quassel with QCA2 present."));
"with support for the Qt Cryptographic Architecture (QCA2) library. "
"Contact your distributor about a Quassel package with QCA2 "
"support, or rebuild Quassel with QCA2 present."));
void CoreUserInputHandler::handleKeyx(const BufferInfo &bufferInfo, const QString &msg)
{
void CoreUserInputHandler::handleKeyx(const BufferInfo &bufferInfo, const QString &msg)
{
+ QString bufname = bufferInfo.bufferName().isNull() ? "" : bufferInfo.bufferName();
#ifdef HAVE_QCA2
if (!bufferInfo.isValid())
return;
#ifdef HAVE_QCA2
if (!bufferInfo.isValid())
return;
if (parms.count() == 0 && !bufferInfo.bufferName().isEmpty())
parms.prepend(bufferInfo.bufferName());
else if (parms.count() != 1) {
if (parms.count() == 0 && !bufferInfo.bufferName().isEmpty())
parms.prepend(bufferInfo.bufferName());
else if (parms.count() != 1) {
- emit displayMsg(Message::Info, bufferInfo.bufferName(),
+ emit displayMsg(Message::Info, bufname,
tr("[usage] /keyx [<nick|channel>] Initiates a DH1080 key exchange with the target."));
return;
}
tr("[usage] /keyx [<nick|channel>] Initiates a DH1080 key exchange with the target."));
return;
}
QByteArray pubKey = cipher->initKeyExchange();
if (pubKey.isEmpty())
QByteArray pubKey = cipher->initKeyExchange();
if (pubKey.isEmpty())
- emit displayMsg(Message::Error, bufferInfo.bufferName(), tr("Failed to initiate key exchange with %1.").arg(target));
+ emit displayMsg(Message::Error, bufname, tr("Failed to initiate key exchange with %1.").arg(target));
else {
QList<QByteArray> params;
params << serverEncode(target) << serverEncode("DH1080_INIT ") + pubKey;
emit putCmd("NOTICE", params);
else {
QList<QByteArray> params;
params << serverEncode(target) << serverEncode("DH1080_INIT ") + pubKey;
emit putCmd("NOTICE", params);
- emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("Initiated key exchange with %1.").arg(target));
+ emit displayMsg(Message::Info, bufname, tr("Initiated key exchange with %1.").arg(target));
- emit displayMsg(Message::Error, bufferInfo.bufferName(), tr("Error: Setting an encryption key requires Quassel to have been built "
+ emit displayMsg(Message::Error, bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
"with support for the Qt Cryptographic Architecture (QCA) library. "
"Contact your distributor about a Quassel package with QCA "
"support, or rebuild Quassel with QCA present."));
"with support for the Qt Cryptographic Architecture (QCA) library. "
"Contact your distributor about a Quassel package with QCA "
"support, or rebuild Quassel with QCA present."));
void CoreUserInputHandler::handleSetkey(const BufferInfo &bufferInfo, const QString &msg)
{
void CoreUserInputHandler::handleSetkey(const BufferInfo &bufferInfo, const QString &msg)
{
+ QString bufname = bufferInfo.bufferName().isNull() ? "" : bufferInfo.bufferName();
#ifdef HAVE_QCA2
if (!bufferInfo.isValid())
return;
#ifdef HAVE_QCA2
if (!bufferInfo.isValid())
return;
if (parms.count() == 1 && !bufferInfo.bufferName().isEmpty())
parms.prepend(bufferInfo.bufferName());
else if (parms.count() != 2) {
if (parms.count() == 1 && !bufferInfo.bufferName().isEmpty())
parms.prepend(bufferInfo.bufferName());
else if (parms.count() != 2) {
- emit displayMsg(Message::Info, bufferInfo.bufferName(),
+ emit displayMsg(Message::Info, bufname,
tr("[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. "
"/setkey <key> when in a channel or query buffer sets the key for it."));
return;
tr("[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. "
"/setkey <key> when in a channel or query buffer sets the key for it."));
return;
QByteArray key = parms.at(1).toLocal8Bit();
network()->setCipherKey(target, key);
QByteArray key = parms.at(1).toLocal8Bit();
network()->setCipherKey(target, key);
- emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("The key for %1 has been set.").arg(target));
+ emit displayMsg(Message::Info, bufname, tr("The key for %1 has been set.").arg(target));
- emit displayMsg(Message::Error, bufferInfo.bufferName(), tr("Error: Setting an encryption key requires Quassel to have been built "
+ emit displayMsg(Message::Error, bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
"with support for the Qt Cryptographic Architecture (QCA) library. "
"Contact your distributor about a Quassel package with QCA "
"support, or rebuild Quassel with QCA present."));
"with support for the Qt Cryptographic Architecture (QCA) library. "
"Contact your distributor about a Quassel package with QCA "
"support, or rebuild Quassel with QCA present."));
void CoreUserInputHandler::handleShowkey(const BufferInfo &bufferInfo, const QString &msg)
{
void CoreUserInputHandler::handleShowkey(const BufferInfo &bufferInfo, const QString &msg)
{
+ QString bufname = bufferInfo.bufferName().isNull() ? "" : bufferInfo.bufferName();
#ifdef HAVE_QCA2
if (!bufferInfo.isValid())
return;
#ifdef HAVE_QCA2
if (!bufferInfo.isValid())
return;
parms.prepend(bufferInfo.bufferName());
if (parms.isEmpty()) {
parms.prepend(bufferInfo.bufferName());
if (parms.isEmpty()) {
- emit displayMsg(Message::Info, bufferInfo.bufferName(), "",
- tr("[usage] /showkey <nick|channel> shows the encryption key for nick or channel or just /showkey when in a channel or query."));
+ emit displayMsg(Message::Info, bufname, tr("[usage] /showkey <nick|channel> shows the encryption key for nick or channel or just /showkey when in a channel or query."));
QByteArray key = network()->cipherKey(target);
if (key.isEmpty()) {
QByteArray key = network()->cipherKey(target);
if (key.isEmpty()) {
- emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("No key has been set for %1.").arg(target));
+ emit displayMsg(Message::Info, bufname, tr("No key has been set for %1.").arg(target));
- emit displayMsg(Message::Info, bufferInfo.bufferName(), tr("The key for %1 is %2").arg(target).arg(QString(key)));
+ emit displayMsg(Message::Info, bufname, tr("The key for %1 is %2").arg(target).arg(QString(key)));
- emit displayMsg(Message::Error, bufferInfo.bufferName(), "", tr("Error: Setting an encryption key requires Quassel to have been built "
+ emit displayMsg(Message::Error, bufname, tr("Error: Setting an encryption key requires Quassel to have been built "
"with support for the Qt Cryptographic Architecture (QCA2) library. "
"Contact your distributor about a Quassel package with QCA2 "
"support, or rebuild Quassel with QCA2 present."));
"with support for the Qt Cryptographic Architecture (QCA2) library. "
"Contact your distributor about a Quassel package with QCA2 "
"support, or rebuild Quassel with QCA2 present."));