fix the problem of accessing the null pointer in non-dde

diff --git a/debian/libdtkcore5.symbols b/debian/libdtkcore5.symbols
index f9493ee3afb8a7f12034441014b36b8203542d11..c6aa5b50cd4105cf4d0262719d1dde52f83dbc73 100644 (file)
--- a/debian/libdtkcore5.symbols
+++ b/debian/libdtkcore5.symbols
@@ -199,6 +199,7 @@ libdtkcore.so.5 libdtkcore5 #MINVER#
  _ZN3Dtk4Core15DSysInfoPrivate16ensureDeepinInfoEv@Base 5.2.2
  _ZN3Dtk4Core15DSysInfoPrivate17ensureReleaseInfoEv@Base 5.2.2
  _ZN3Dtk4Core15DSysInfoPrivate18ensureComputerInfoEv@Base 5.2.2
+ _ZN3Dtk4Core15DSysInfoPrivate22ensureDistributionInfoEv@Base 5.4.0-1~exp1
  _ZN3Dtk4Core15DSysInfoPrivateC1Ev@Base 5.2.2
  _ZN3Dtk4Core15DSysInfoPrivateC2Ev@Base 5.2.2
  _ZN3Dtk4Core15QSettingBackend11doSetOptionERK7QStringRK8QVariant@Base 5.2.2

diff --git a/debian/patches/0001-fix-access-null-pointer.patch b/debian/patches/0001-fix-access-null-pointer.patch
new file mode 100644 (file)
index 0000000..a5ed0a0
--- /dev/null
+++ b/debian/patches/0001-fix-access-null-pointer.patch
@@ -0,0 +1,65 @@
+Description: fix access null pointer
+ TODO: fix access null pointer
+Author: Hu Feng <hufeng@uniontech.com>
+
+Forwarded: not-needed
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2021-03-02
+
+--- dtkcore-5.4.0.orig/src/dsysinfo.cpp
++++ dtkcore-5.4.0/src/dsysinfo.cpp
+@@ -48,6 +48,7 @@ public:
+ #ifdef Q_OS_LINUX
+     void ensureDeepinInfo();
+     bool ensureOsVersion();
++    void ensureDistributionInfo();
+ #endif
+     void ensureReleaseInfo();
+     void ensureComputerInfo();
+@@ -97,6 +98,16 @@ DSysInfoPrivate::DSysInfoPrivate()
+ }
+ 
+ #ifdef Q_OS_LINUX
++void DSysInfoPrivate::ensureDistributionInfo()
++{
++    if (distributionInfo)
++        return;
++
++    const QString distributionInfoFile(DSysInfo::distributionInfoPath());
++    // Generic DDE distribution info
++    distributionInfo.reset(new DDesktopEntry(distributionInfoFile));
++}
++
+ void DSysInfoPrivate::ensureDeepinInfo()
+ {
+     if (static_cast<int>(deepinType) >= 0)
+@@ -168,11 +179,6 @@ void DSysInfoPrivate::ensureDeepinInfo()
+     } else {
+         deepinType = DSysInfo::UnknownDeepin;
+     }
+-
+-    const QString distributionInfoFile(DSysInfo::distributionInfoPath());
+-    // Generic DDE distribution info
+-    distributionInfo.reset(new DDesktopEntry(distributionInfoFile));
+-    QSettings distributionInfo(distributionInfoFile, QSettings::IniFormat); // TODO: treat as `.desktop` format instead of `.ini`
+ }
+ 
+ bool DSysInfoPrivate::ensureOsVersion()
+@@ -734,7 +740,7 @@ QString DSysInfo::distributionInfoSectio
+ QString DSysInfo::distributionOrgName(DSysInfo::OrgType type, const QLocale &locale)
+ {
+ #ifdef Q_OS_LINUX
+-    siGlobal->ensureDeepinInfo();
++      siGlobal->ensureDistributionInfo();
+ #endif
+ 
+     QString fallback = type == Distribution ? QStringLiteral("Deepin") : QString();
+@@ -757,7 +763,7 @@ QString DSysInfo::deepinDistributorName(
+ QPair<QString, QString> DSysInfo::distributionOrgWebsite(DSysInfo::OrgType type)
+ {
+ #ifdef Q_OS_LINUX
+-    siGlobal->ensureDeepinInfo();
++      siGlobal->ensureDistributionInfo();
+ #endif
+ 
+     QString fallbackSiteName = type == Distribution ? QStringLiteral("www.deepin.org") : QString();

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..c6db926
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-access-null-pointer.patch