/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include <QTcpSocket>
#include "legacypeer.h"
+#include "serializers/serializers.h"
/* version.inc is no longer used for this */
const uint protocolVersion = 10;
QVariant item;
if (_useCompression) {
QByteArray rawItem;
- stream >> rawItem;
+ if (!Serializers::deserialize(stream, rawItem)) {
+ close("Peer sent corrupt data: unable to load QVariant!");
+ return;
+ }
int nbytes = rawItem.size();
if (nbytes <= 4) {
QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
itemStream.setVersion(QDataStream::Qt_4_2);
- itemStream >> item;
- }
- else {
- stream >> item;
+ if (!Serializers::deserialize(itemStream, item)) {
+ close("Peer sent corrupt data: unable to load QVariant!");
+ return;
+ }
+ } else {
+ if (!Serializers::deserialize(stream, item)) {
+ close("Peer sent corrupt data: unable to load QVariant!");
+ return;
+ }
}
if (stream.status() != QDataStream::Ok || !item.isValid()) {
socket()->setProperty("UseCompression", true);
#endif
- handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), m["SupportSsl"].toBool(), QString()));
+ handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), m["SupportSsl"].toBool()));
}
else if (msgType == "CoreSetupData") {
m["SupportSsl"] = msg.sslSupported;
m["SupportsCompression"] = socket()->property("UseCompression").toBool(); // this property gets already set in the ClientInit handler
- // This is only used for old v10 clients (pre-0.5)
- m["CoreInfo"] = msg.coreInfo;
+ // This is only used for display by really old v10 clients (pre-0.5), and we no longer set this
+ m["CoreInfo"] = QString();
m["LoginEnabled"] = m["Configured"] = msg.coreConfigured;