[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Tue Jun 16 11:23:04 MDT 2015


The branch, master has been updated
       via  cf59815 lib: Fix CID 1306765 Unchecked return value from library
       via  90eefb1 lib: Fix CID 1306764 Unchecked return value
      from  9df07e6 Group creation: Add msSFU30Name only when --nis-domain was given

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cf598156dd947b839a6ccb6d88868c5080ec5907
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jun 16 06:20:56 2015 +0000

    lib: Fix CID 1306765 Unchecked return value from library
    
    This one might be a bit controversial. I don't see from man fcntl how this
    could fail. But if it does, we definitely do want to know about it. And here we
    don't have any good way to tell our caller, so abort.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: "Stefan (metze) Metzmacher" <metze at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Tue Jun 16 19:22:52 CEST 2015 on sn-devel-104

commit 90eefb1779131c25b588043457fc3c4f4e0521f4
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jun 16 06:12:47 2015 +0000

    lib: Fix CID 1306764 Unchecked return value
    
    tevent_req_oom exists right for this case :-)
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: "Stefan (metze) Metzmacher" <metze at samba.org>

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

Summary of changes:
 lib/async_req/async_sock.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 03bda58..e90f4e6 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -156,7 +156,13 @@ static void async_connect_cleanup(struct tevent_req *req,
 
 	TALLOC_FREE(state->fde);
 	if (state->fd != -1) {
-		fcntl(state->fd, F_SETFL, state->old_sockflags);
+		int ret;
+
+		ret = fcntl(state->fd, F_SETFL, state->old_sockflags);
+		if (ret == -1) {
+			abort();
+		}
+
 		state->fd = -1;
 	}
 }
@@ -267,7 +273,7 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 	}
 
 	if (!tevent_queue_add(queue, ev, req, writev_trigger, NULL)) {
-		tevent_req_nomem(NULL, req);
+		tevent_req_oom(req);
 		return tevent_req_post(req, ev);
 	}
 	return req;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list