static analyzer warning fix

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index e38902b..45d95a9 100644 (file)
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -282,7 +282,7 @@ public:
     static QDBusCallDeliveryEvent *prepareReply(QDBusConnectionPrivate *target, QObject *object,
                                                 int idx, const QList<int> &metaTypes,
                                                 const QDBusMessage &msg);
-    static void processFinishedCall(QDBusPendingCallPrivate *call);
+    static QDBusPendingCallPrivate* processFinishedCall(QDBusPendingCallPrivate *call);
 
     static QDBusConnectionPrivate *d(const QDBusConnection& q) { return q.d; }
     static QDBusConnection q(QDBusConnectionPrivate *connection) { return QDBusConnection(connection); }

diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 278a6b5..f77c3ee 100644 (file)
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -1720,7 +1720,7 @@ void QDBusConnectionPrivate::waitForFinished(QDBusPendingCallPrivate *pcall)
     }
 }
 
-void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call)
+QDBusPendingCallPrivate* QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call)
 {
     QDBusConnectionPrivate *connection = const_cast<QDBusConnectionPrivate *>(call->connection);
 
@@ -1769,8 +1769,11 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call)
     if (msg.type() == QDBusMessage::ErrorMessage)
         emit connection->callWithCallbackFailed(QDBusError(msg), call->sentMessage);
 
-    if (!call->ref.deref())
+    if (!call->ref.deref()) {
         delete call;
+        return Q_NULLPTR;
+    }
+    return call;
 }
 
 bool QDBusConnectionPrivate::send(const QDBusMessage& message)
@@ -1941,8 +1944,7 @@ QDBusPendingCallPrivate *QDBusConnectionPrivate::sendWithReplyAsync(const QDBusM
            // by QDBusPendingCall::QExplicitlySharedDataPointer<QDBusPendingCallPrivate>
            pcall->ref = 2;
         }
-        processFinishedCall(pcall);
-        return pcall;
+        return processFinishedCall(pcall);
     }
 
     checkThread();
@@ -1975,8 +1977,7 @@ QDBusPendingCallPrivate *QDBusConnectionPrivate::sendWithReplyAsync(const QDBusM
                  qPrintable(error.message()));
         pcall->replyMessage = QDBusMessage::createError(error);
         lastError = error;
-        processFinishedCall(pcall);
-        return pcall;
+        return processFinishedCall(pcall);
     }
 
     qDBusDebug() << this << "sending message (async):" << message;
@@ -2001,8 +2002,7 @@ QDBusPendingCallPrivate *QDBusConnectionPrivate::sendWithReplyAsync(const QDBusM
 
     dbus_message_unref(msg);
     pcall->replyMessage = QDBusMessage::createError(error);
-    processFinishedCall(pcall);
-    return pcall;
+    return processFinishedCall(pcall);
 }
 
 bool QDBusConnectionPrivate::connectSignal(const QString &service,