tidy: Silence "NewDelete" warning in cc708window.cpp.

https://clang.llvm.org/extra/clang-tidy/checks/clang-analyzer-cplusplus.NewDelete.html
MythTV · Aug 29, 2020 · da5ebe6 · da5ebe6
1 parent 3061d79
commit da5ebe6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -79,9 +79,6 @@ Checks: '-*,
         # One instance in mpegdescriptors.h ,
        -clang-analyzer-core.NullDereference,
 
-        # One instance in cc708window.h. ,
-       -clang-analyzer-cplusplus.NewDelete,
-
         # The "safe" versions functions were optional in the standard
         # and were never implemented by GCC or Clang.  There has been
         # a move to have these functions removed from the standard as

diff --git a/mythtv/libs/libmythtv/captions/cc708window.h b/mythtv/libs/libmythtv/captions/cc708window.h
@@ -74,6 +74,13 @@ const int k708MaxWindows = 8;
 const int k708MaxRows    = 16; // 4-bit field in DefineWindow
 const int k708MaxColumns = 64; // 6-bit field in DefineWindow
 
+// Weird clang-tidy error from cc708window.cpp:212 that the attribute
+// assignment is using zero allocated memory. Changing that code to
+// explicitly copy each field of the structure, and then changing the
+// first copy statement to assign a constant instead, shows that the
+// warning is about the left side of the assignment statement. That
+// should overwrite any zero-allocated memory, not reference it.
+// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDelete)
 class CC708CharacterAttribute
 {
   public:
@@ -159,7 +166,7 @@ class CC708Pen
         m_attr.m_boldface  = false;
     }
   public:
-    CC708CharacterAttribute m_attr;
+    CC708CharacterAttribute m_attr {};
 
     uint m_row    {0};
     uint m_column {0};
@@ -171,7 +178,7 @@ class CC708Character
   public:
     CC708Character() = default;
     explicit CC708Character(const CC708Window &win);
-    CC708CharacterAttribute m_attr;
+    CC708CharacterAttribute m_attr {};
     QChar                   m_character {' '};
 };
 
@@ -181,7 +188,7 @@ class CC708String
     uint                    m_x {0};
     uint                    m_y {0};
     QString                 m_str;
-    CC708CharacterAttribute m_attr;
+    CC708CharacterAttribute m_attr {};
 };
 
 class MTV_PUBLIC CC708Window
@@ -269,7 +276,7 @@ class MTV_PUBLIC CC708Window
     uint            m_true_column_count {0};
 
     CC708Character *m_text              {nullptr};
-    CC708Pen        m_pen;
+    CC708Pen        m_pen               {};
 
  private:
     /// set to false when DeleteWindow is called on the window.