From 6dc2131ab0a5225decdcdb8fff8706a340d9ed3b Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Tue, 23 Jun 2009 14:57:41 +0200
Subject: check pending_return after dbus_connection_send_with_reply

---
 server/monitor/monitor.c               | 8 ++++----
 server/providers/data_provider.c       | 6 +++---
 server/responder/common/responder_dp.c | 2 +-
 server/responder/pam/pamsrv_dp.c       | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c
index 2a444dc6..e4898dd5 100644
--- a/server/monitor/monitor.c
+++ b/server/monitor/monitor.c
@@ -462,7 +462,7 @@ static int monitor_shutdown_service(struct mt_svc *svc)
 
     dbret = dbus_connection_send_with_reply(conn, msg, &pending_reply,
                                             svc->mt_ctx->service_id_timeout);
-    if (!dbret) {
+    if (!dbret || pending_reply == NULL) {
         DEBUG(0, ("D-BUS send failed.\n"));
         dbus_message_unref(msg);
         monitor_kill_service(svc);
@@ -548,7 +548,7 @@ static int service_signal_reload(struct mt_svc *svc)
 
     dbret = dbus_connection_send_with_reply(conn, msg, &pending_reply,
                                             svc->mt_ctx->service_id_timeout);
-    if (!dbret) {
+    if (!dbret || pending_reply == NULL) {
         DEBUG(0, ("D-BUS send failed.\n"));
         dbus_message_unref(msg);
         monitor_kill_service(svc);
@@ -1602,7 +1602,7 @@ static int dbus_service_init(struct sbus_conn_ctx *conn_ctx, void *data)
     }
     dbret = dbus_connection_send_with_reply(conn, msg, &pending_reply,
                                             ctx->service_id_timeout);
-    if (!dbret) {
+    if (!dbret || pending_reply == NULL) {
         /*
          * Critical Failure
          * We can't communicate on this connection
@@ -1750,7 +1750,7 @@ static int service_send_ping(struct mt_svc *svc)
 
     dbret = dbus_connection_send_with_reply(conn, msg, &pending_reply,
                                             svc->mt_ctx->service_id_timeout);
-    if (!dbret) {
+    if (!dbret || pending_reply == NULL) {
         /*
          * Critical Failure
          * We can't communicate on this connection
diff --git a/server/providers/data_provider.c b/server/providers/data_provider.c
index e8f190ea..677f677f 100644
--- a/server/providers/data_provider.c
+++ b/server/providers/data_provider.c
@@ -255,7 +255,7 @@ static int dbus_dp_init(struct sbus_conn_ctx *conn_ctx, void *data)
     }
     dbret = dbus_connection_send_with_reply(conn, msg, &pending_reply,
                                             600000 /* TODO: set timeout */);
-    if (!dbret) {
+    if (!dbret || pending_reply == NULL) {
         /*
          * Critical Failure
          * We can't communicate on this connection
@@ -536,7 +536,7 @@ static int dp_send_acct_req(struct dp_be_request *bereq,
 
     ret = dbus_connection_send_with_reply(conn, msg, &pending_reply,
                                             600000 /* TODO: set timeout */);
-    if (!ret) {
+    if (!ret || pending_reply == NULL) {
         /*
          * Critical Failure
          * We can't communicate on this connection
@@ -830,7 +830,7 @@ static int dp_call_pamhandler(struct dp_be_request *bereq, struct pam_data *pd)
 
     ret = dbus_connection_send_with_reply(conn, msg, &pending_reply,
                                             600000 /* TODO: set timeout */);
-    if (!ret) {
+    if (!ret || pending_reply == NULL) {
         /*
          * Critical Failure
          * We can't communicate on this connection
diff --git a/server/responder/common/responder_dp.c b/server/responder/common/responder_dp.c
index 83f89a54..bfc533b9 100644
--- a/server/responder/common/responder_dp.c
+++ b/server/responder/common/responder_dp.c
@@ -272,7 +272,7 @@ int nss_dp_send_acct_req(struct resp_ctx *rctx, TALLOC_CTX *memctx,
 
     ret = dbus_connection_send_with_reply(conn, msg, &pending_reply,
                                             600000 /* TODO: set timeout */);
-    if (!ret) {
+    if (!ret || pending_reply == NULL) {
         /*
          * Critical Failure
          * We can't communicate on this connection
diff --git a/server/responder/pam/pamsrv_dp.c b/server/responder/pam/pamsrv_dp.c
index fadb284a..1de43478 100644
--- a/server/responder/pam/pamsrv_dp.c
+++ b/server/responder/pam/pamsrv_dp.c
@@ -119,7 +119,7 @@ int pam_dp_send_req(struct pam_auth_req *preq, int timeout)
     }
 
     ret = dbus_connection_send_with_reply(conn, msg, &pending_reply, timeout);
-    if (!ret) {
+    if (!ret || pending_reply == NULL) {
         /*
          * Critical Failure
          * We can't communicate on this connection
-- 
cgit