Fix issues detected by svace

Change-Id: Icdfa44aca13924c4e73e5cf7345fea6ed8857433

diff --git a/src/Atspi.hpp b/src/Atspi.hpp
index 845af0e..9cb753e 100644 (file)
--- a/src/Atspi.hpp
+++ b/src/Atspi.hpp
@@ -930,7 +930,7 @@ public:
        {
                friend class Atspi;
                friend class std::default_delete<WatchHandler>;
-               Atspi *atspi;
+               Atspi *atspi = nullptr;
                size_t index = 0;
 
                WatchHandler() = default;

diff --git a/src/batch/Dlog.cpp b/src/batch/Dlog.cpp
index f188843..eaa3fdb 100644 (file)
--- a/src/batch/Dlog.cpp
+++ b/src/batch/Dlog.cpp
@@ -129,8 +129,13 @@ bool Dlog::start()
                                        DEBUG("spurious wake...");
                                }
                        }
-                       close(closingFd);
-                       close(dlogFile);
+
+                       if (close(closingFd) == -1)
+                               WARNING("Failed to close pipes");
+
+                       if (close(dlogFile) == -1)
+                               WARNING("Failed to close file");
+
                } };
        return true;
 }

diff --git a/tests/no-ui-scenarios/DBusTests.cpp b/tests/no-ui-scenarios/DBusTests.cpp
index 391b6d9..efc2551 100644 (file)
--- a/tests/no-ui-scenarios/DBusTests.cpp
+++ b/tests/no-ui-scenarios/DBusTests.cpp
@@ -680,7 +680,9 @@ int main(int argc, char *argv[])
                        DEBUG("exception");
                        r = 1;
                }
-               kill(c, 9);
+               if (kill(c, 9) == -1)
+                       WARNING("failed to kill: %d", c);
+
                return r;
        } else {
                ASSERT(0, "failed to fork");

diff --git a/tests/no-ui-scenarios/OptionalTests.cpp b/tests/no-ui-scenarios/OptionalTests.cpp
index f08cd86..0b637d8 100644 (file)
--- a/tests/no-ui-scenarios/OptionalTests.cpp
+++ b/tests/no-ui-scenarios/OptionalTests.cpp
@@ -68,6 +68,8 @@ public:
                ClassWithCounters &operator = (const ClassWithCounters &other)
                {
                        ++assignmentCallsCount;
+                       if (&other == this)
+                               return *this;
                        value = other.value;
                        return *this;
                }
@@ -75,6 +77,8 @@ public:
                ClassWithCounters &operator = (ClassWithCounters &&other)
                {
                        ++assignmentCallsCount;
+                       if (&other == this)
+                               return *this;
                        value = other.value;
                        return *this;
                }