From: Jeremy Allison <jra@samba.org>
Date: Wed, 29 Oct 2008 23:28:04 +0000 (-0700)
Subject: Fix CID 574 - tidies up the code expression.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64ae7048fefe39d05d0c2c92e3c96b6d83fd8ef5;p=thirdparty%2Fsamba.git

Fix CID 574 - tidies up the code expression.
Jeremy.
---

diff --git a/source/smbd/notify_inotify.c b/source/smbd/notify_inotify.c
index fa0f0ed51dc..c6c12a9cd2d 100644
--- a/source/smbd/notify_inotify.c
+++ b/source/smbd/notify_inotify.c
@@ -243,14 +243,14 @@ static void inotify_handler(struct event_context *ev, struct fd_event *fde,
 	e0 = e = (struct inotify_event *)TALLOC_SIZE(in, bufsize);
 	if (e == NULL) return;
 
-	if (read(in->fd, e0, bufsize) != bufsize) {
+	if (sys_read(in->fd, e0, bufsize) != bufsize) {
 		DEBUG(0,("Failed to read all inotify data\n"));
 		talloc_free(e0);
 		return;
 	}
 
 	/* we can get more than one event in the buffer */
-	while (bufsize >= sizeof(*e)) {
+	while (e && (bufsize >= sizeof(*e))) {
 		struct inotify_event *e2 = NULL;
 		bufsize -= e->len + sizeof(*e);
 		if (bufsize >= sizeof(*e)) {