From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 7 Jan 2015 15:15:33 +0000 (+0100)
Subject: sync/EventKqueue.cc: fix possible null pointer dereference
X-Git-Tag: suse_latest~36^2~9^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8652ec99a3aaf27b4466deb743b25f4c3689148b;p=ceph.git

sync/EventKqueue.cc: fix possible null pointer dereference

Remove pointer deref before NULL check. These lines are already
after NULL check.

Fix for:
[src/msg/async/EventKqueue.cc:96] -> [src/msg/async/EventKqueue.cc:99]:
 (warning) Possible null pointer dereference: tvp - otherwise it is
 redundant to check it against null.
[src/msg/async/EventKqueue.cc:97] -> [src/msg/async/EventKqueue.cc:99]:
 (warning) Possible null pointer dereference: tvp - otherwise it is
 redundant to check it against null.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/msg/async/EventKqueue.cc b/src/msg/async/EventKqueue.cc
index 13dba68b7e6b..10156da17755 100644
--- a/src/msg/async/EventKqueue.cc
+++ b/src/msg/async/EventKqueue.cc
@@ -93,8 +93,6 @@ int KqueueDriver::event_wait(vector<FiredFileEvent> &fired_events, struct timeva
 {
   int retval, numevents = 0;
   struct timespec timeout;
-  timeout.tv_sec = tvp->tv_sec;
-  timeout.tv_nsec = tvp->tv_usec * 1000;
 
   if (tvp != NULL) {
       timeout.tv_sec = tvp->tv_sec;