remove memory leak in create_jwt() (#20547)

pull/20585/head
Dean Lee 4 years ago committed by GitHub
parent 66d7f8eb3f
commit d14aba4580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      selfdrive/ui/qt/api.cc
  2. 3
      selfdrive/ui/qt/api.hpp
  3. 4
      selfdrive/ui/qt/widgets/setup.cc

@ -72,10 +72,6 @@ QString CommaApi::create_jwt(QVector<QPair<QString, QJsonValue>> payloads, int e
return jwt; return jwt;
} }
QString CommaApi::create_jwt() {
return create_jwt(*(new QVector<QPair<QString, QJsonValue>>()));
}
RequestRepeater::RequestRepeater(QWidget* parent, QString requestURL, int period_seconds, const QString &cache_key, bool disableWithScreen) RequestRepeater::RequestRepeater(QWidget* parent, QString requestURL, int period_seconds, const QString &cache_key, bool disableWithScreen)
: disableWithScreen(disableWithScreen), cache_key(cache_key), QObject(parent) { : disableWithScreen(disableWithScreen), cache_key(cache_key), QObject(parent) {
networkAccessManager = new QNetworkAccessManager(this); networkAccessManager = new QNetworkAccessManager(this);
@ -104,7 +100,7 @@ void RequestRepeater::sendRequest(QString requestURL){
return; return;
} }
QString token = CommaApi::create_jwt({}); QString token = CommaApi::create_jwt();
QNetworkRequest request; QNetworkRequest request;
request.setUrl(QUrl(requestURL)); request.setUrl(QUrl(requestURL));
request.setRawHeader(QByteArray("Authorization"), ("JWT " + token).toUtf8()); request.setRawHeader(QByteArray("Authorization"), ("JWT " + token).toUtf8());

@ -19,8 +19,7 @@ class CommaApi : public QObject {
public: public:
static QByteArray rsa_sign(QByteArray data); static QByteArray rsa_sign(QByteArray data);
static QString create_jwt(QVector<QPair<QString, QJsonValue>> payloads, int expiry=3600); static QString create_jwt(QVector<QPair<QString, QJsonValue>> payloads = {}, int expiry=3600);
static QString create_jwt();
private: private:
QNetworkAccessManager* networkAccessManager; QNetworkAccessManager* networkAccessManager;

@ -37,9 +37,7 @@ void PairingQRWidget::refresh(){
qrCode->setStyleSheet(R"(font-size: 60px;)"); qrCode->setStyleSheet(R"(font-size: 60px;)");
return; return;
} }
QVector<QPair<QString, QJsonValue>> payloads; QString pairToken = CommaApi::create_jwt({{"pair", true}});
payloads.push_back(qMakePair(QString("pair"), true));
QString pairToken = CommaApi::create_jwt(payloads);
QString qrString = IMEI + "--" + serial + "--" + pairToken; QString qrString = IMEI + "--" + serial + "--" + pairToken;
this->updateQrCode(qrString); this->updateQrCode(qrString);

Loading…
Cancel
Save