[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4306-g8dfb52c

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  8dfb52caaa9a7e37acf1f9e01226ae4c5e8a2e5b (commit)
      from  d6d41e85d4c7c041683057fb39196898c6218212 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 8dfb52caaa9a7e37acf1f9e01226ae4c5e8a2e5b
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 29 16:28:38 2008 -0700

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

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/notify_inotify.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/notify_inotify.c b/source/smbd/notify_inotify.c
index fa0f0ed..c6c12a9 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)) {


-- 
Samba Shared Repository