diff options
| author | Vsevolod Buzinov <ext-vsevolod.buzinov@nokia.com> | 2010-10-06 11:39:28 +0300 |
|---|---|---|
| committer | Vsevolod Buzinov <ext-vsevolod.buzinov@nokia.com> | 2010-10-14 14:03:18 +0300 |
| commit | e19026eafd653fde0250cffd9ba61db439757655 (patch) | |
| tree | 3c02c273ae1a6280cb7024d01f5277ef32d993c1 | |
| parent | ee2a0e690550849839f4452acb024d2fc2accd40 (diff) | |
Coverity-based fixes
Reverted the break in input_cb
| -rw-r--r-- | src/dbus-proto.c | 10 | ||||
| -rw-r--r-- | src/res-proto.c | 4 | ||||
| -rw-r--r-- | src/res-set.c | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/src/dbus-proto.c b/src/dbus-proto.c index 6aa26db..958f19d 100644 --- a/src/dbus-proto.c +++ b/src/dbus-proto.c @@ -276,10 +276,12 @@ static void status_method(DBusPendingCall *pend, void *data) if (dbus_message_get_type(dbusmsg) == DBUS_MESSAGE_TYPE_ERROR) { errmsg = dbus_message_get_error_name(dbusmsg); - if (!strncmp(errmsg, "org.freedesktop.", 16)) - errmsg += 16; - else if (!strncmp(errmsg, "com.nokia.", 10)) - errmsg += 10; + if (errmsg != NULL) { + if (!strncmp(errmsg, "org.freedesktop.", 16)) + errmsg += 16; + else if (!strncmp(errmsg, "com.nokia.", 10)) + errmsg += 10; + } memset(&resmsg, 0, sizeof(resmsg)); resmsg.status.type = RESMSG_STATUS; diff --git a/src/res-proto.c b/src/res-proto.c index 2ba1b72..b21a9f3 100644 --- a/src/res-proto.c +++ b/src/res-proto.c @@ -101,13 +101,15 @@ EXPORT int resproto_reply_message(resset_t *rset, int32_t errcod, const char *errmsg) { - resconn_t *rcon = rset->resconn; + resconn_t *rcon; resmsg_t reply; int success; if (!rset || !resmsg) success = FALSE; else { + rcon = rset->resconn; + if (protodata == NULL) success = TRUE; else { diff --git a/src/res-set.c b/src/res-set.c index bec5ae8..8645bb8 100644 --- a/src/res-set.c +++ b/src/res-set.c @@ -79,11 +79,12 @@ void resset_ref(resset_t *rset) void resset_unref(resset_t *rset) { - resconn_dbus_t *rcon = &rset->resconn->dbus; + resconn_dbus_t *rcon; resset_t *prev; if (rset != NULL && --rset->refcnt <= 0) { - + rcon = &rset->resconn->dbus; + for (prev = (resset_t *)&rcon->rsets; prev->next; prev = prev->next){ if (prev->next == rset) { prev->next = rset->next; |