retropilot
/
openpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove memory leak in create_jwt() (#20547)

albatross
Dean Lee 2021-04-06 01:05:04 +08:00 committed by GitHub
parent 66d7f8eb3f
commit d14aba4580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
selfdrive/ui/qt/api.cc
View File

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

3
selfdrive/ui/qt/api.hpp
View File

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

4
selfdrive/ui/qt/widgets/setup.cc
View File

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