From 647cdc40d0d4d2f010350099e408c11dd0608904 Mon Sep 17 00:00:00 2001
From: Willyanto Willyanto <willyanto39@protonmail.com>
Date: Thu, 23 Mar 2023 17:37:37 +0000
Subject: [PATCH] Perform some initializations in initialization list

Fixes some variable is assigned in constructor body. Consider performing
initialization in initialization list. (CWE-398)
---
 generators/chm/lib/ebook_chm.cpp | 14 ++++++--------
 generators/dvi/anchor.h          |  2 +-
 generators/dvi/prebookmark.h     |  6 +++---
 generators/dvi/simplePageSize.h  |  4 ++--
 gui/certificatemodel.cpp         |  2 +-
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/generators/chm/lib/ebook_chm.cpp b/generators/chm/lib/ebook_chm.cpp
index b8533ded2..d0620911f 100644
--- a/generators/chm/lib/ebook_chm.cpp
+++ b/generators/chm/lib/ebook_chm.cpp
@@ -28,15 +28,13 @@
 
 EBook_CHM::EBook_CHM()
     : EBook()
+    , m_chmFile(nullptr)
+    , m_detectedLCID(0)
+    , m_textCodec(nullptr)
+    , m_textCodecForSpecialFiles(nullptr)
+    , m_currentEncoding(QStringLiteral("UTF-8"))
+    , m_envOptions(QString::fromLatin1(qgetenv("KCHMVIEWEROPTS")))
 {
-    m_envOptions = QString::fromLatin1(qgetenv("KCHMVIEWEROPTS"));
-    m_chmFile = nullptr;
-    m_filename = m_font = QString();
-
-    m_textCodec = nullptr;
-    m_textCodecForSpecialFiles = nullptr;
-    m_detectedLCID = 0;
-    m_currentEncoding = QStringLiteral("UTF-8");
 }
 
 EBook_CHM::~EBook_CHM()
diff --git a/generators/dvi/anchor.h b/generators/dvi/anchor.h
index 9d6fe4dd1..a1364c499 100644
--- a/generators/dvi/anchor.h
+++ b/generators/dvi/anchor.h
@@ -30,8 +30,8 @@ class Anchor
 public:
     /** \brief Constructs an anchor that points to an invalid page */
     Anchor()
+        : page(0)
     {
-        page = 0;
     }
 
     /** \brief Constructs an anchor that points to a given position on a
diff --git a/generators/dvi/prebookmark.h b/generators/dvi/prebookmark.h
index 2dcc53dd6..0a01f4848 100644
--- a/generators/dvi/prebookmark.h
+++ b/generators/dvi/prebookmark.h
@@ -23,10 +23,10 @@ public:
         noOfChildren = 0;
     }
     PreBookmark(const QString &t, const QString &a, quint16 n)
+        : title(t)
+        , anchorName(a)
+        , noOfChildren(n)
     {
-        title = t;
-        anchorName = a;
-        noOfChildren = n;
     }
 
     // Title of the bookmark
diff --git a/generators/dvi/simplePageSize.h b/generators/dvi/simplePageSize.h
index 88ef4438e..71bdde8bb 100644
--- a/generators/dvi/simplePageSize.h
+++ b/generators/dvi/simplePageSize.h
@@ -48,9 +48,9 @@ public:
         @param height
     */
     SimplePageSize(const Length width, const Length height)
+        : pageWidth(width)
+        , pageHeight(height)
     {
-        pageWidth = width;
-        pageHeight = height;
     }
 
     ~SimplePageSize()
diff --git a/gui/certificatemodel.cpp b/gui/certificatemodel.cpp
index 9ff58c6e3..6daadeaca 100644
--- a/gui/certificatemodel.cpp
+++ b/gui/certificatemodel.cpp
@@ -17,9 +17,9 @@
 
 CertificateModel::CertificateModel(const Okular::CertificateInfo &certInfo, QObject *parent)
     : QAbstractTableModel(parent)
+    , m_certificateProperties({Version, SerialNumber, Issuer, IssuedOn, ExpiresOn, Subject, PublicKey, KeyUsage})
     , m_certificateInfo(certInfo)
 {
-    m_certificateProperties = {Version, SerialNumber, Issuer, IssuedOn, ExpiresOn, Subject, PublicKey, KeyUsage};
 }
 
 int CertificateModel::columnCount(const QModelIndex &) const