spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2025-12-13 20:32:05 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix: 修复退出时崩溃问题

Browse Source 
AppIntoPage 析构函数中使用 free 释放 rawHeaders 指针存在问题

Log: 使用 QByteArray 全局变量存储 User-Agent 字符串，无需使用指针，避免析构问题
This commit is contained in:
zty199
2023-12-30 00:41:06 +08:00
parent 62e23facfb
commit 0c4f5dacca
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pages/appintopage.cpp
View File

@@ -22,15 +22,12 @@ AppIntoPage::AppIntoPage(QWidget *parent)
{ {
initUI(); initUI();
initConnections(); initConnections();
QString headers = "Mozilla/5.0 Spark-Store/"+ QString(APP_VERSION)+" (Linux; "+QSysInfo::prettyProductName().toUtf8()+";)"; m_userAgent = QString("Mozilla/5.0 Spark-Store/" + QString(APP_VERSION) + " (Linux; " + QSysInfo::prettyProductName().toUtf8() + ";)").toLatin1();
QByteArray ba = headers.toLatin1(); // must
rawHeaders=ba.data();
} }
AppIntoPage::~AppIntoPage() AppIntoPage::~AppIntoPage()
{ {
delete ui; delete ui;
free(rawHeaders);
} }
void AppIntoPage::openUrl(const QUrl &url) void AppIntoPage::openUrl(const QUrl &url)
@@ -74,8 +71,8 @@ void AppIntoPage::openUrl(const QUrl &url)
// 获取图标 // 获取图标
QNetworkRequest iconRequest; QNetworkRequest iconRequest;
iconRequest.setUrl(QUrl(pkgUrlBase + "/icon.png")); iconRequest.setUrl(QUrl(pkgUrlBase + "/icon.png"));
iconRequest.setRawHeader("User-Agent", rawHeaders); iconRequest.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
iconRequest.setRawHeader("Content-Type", "charset='utf-8'"); iconRequest.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
iconManager->get(iconRequest); iconManager->get(iconRequest);
QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
@@ -97,8 +94,8 @@ void AppIntoPage::openUrl(const QUrl &url)
QNetworkRequest request; QNetworkRequest request;
QNetworkAccessManager *manager = new QNetworkAccessManager(this); QNetworkAccessManager *manager = new QNetworkAccessManager(this);
request.setUrl(QUrl(imgUrl)); request.setUrl(QUrl(imgUrl));
request.setRawHeader("User-Agent", rawHeaders); request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
request.setRawHeader("Content-Type", "charset='utf-8'"); request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
manager->get(request); manager->get(request);
QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
{ {

4
src/pages/appintopage.h
View File

@@ -30,8 +30,6 @@ private:
void isDownloading(const QUrl &url); void isDownloading(const QUrl &url);
void setAppinfoTags(const QStringList &tagList); void setAppinfoTags(const QStringList &tagList);
void notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport); void notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport);
char* rawHeaders;
QMap<int, QPixmap> imageMap;
signals: signals:
void clickedDownloadBtn(); void clickedDownloadBtn();
@@ -51,6 +49,8 @@ private:
QJsonObject info; QJsonObject info;
QPixmap iconpixmap; QPixmap iconpixmap;
QUrl spk; QUrl spk;
QByteArray m_userAgent;
}; };
#endif // APPINTOPAGE_H #endif // APPINTOPAGE_H