[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-2317-g0c3580c
Volker Lendecke
vlendec at samba.org
Mon Jun 15 05:47:41 GMT 2009
The branch, master has been updated
via 0c3580c5de63265c54924a5f171e858a0bfb2a79 (commit)
via b7062657864d979e37f541189a164cae3f700a31 (commit)
from 49eccee209f01af043d084742bbbc9d4519eddfc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0c3580c5de63265c54924a5f171e858a0bfb2a79
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 15 07:45:47 2009 +0200
Do a correct TALLOC_FREE in an error case
commit b7062657864d979e37f541189a164cae3f700a31
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 15 07:45:11 2009 +0200
Fix a = vs == error in writev_handler
-----------------------------------------------------------------------
Summary of changes:
lib/async_req/async_sock.c | 2 +-
source3/printing/nt_printing.c | 5 ++++-
2 files changed, 5 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 cf007e1..f5a0dfd 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -439,7 +439,7 @@ static void writev_handler(struct tevent_context *ev, struct tevent_fd *fde,
}
written = writev(state->fd, state->iov, state->count);
- if ((written == -1) && (errno = EINTR)) {
+ if ((written == -1) && (errno == EINTR)) {
/* retry */
return;
}
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 74aaf02..f496ae5 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1823,7 +1823,10 @@ static WERROR move_driver_file_to_download_area(TALLOC_CTX *mem_ctx,
new_name = talloc_asprintf(mem_ctx, "%s/%d/%s",
short_architecture, driver_version, driver_file);
- W_ERROR_HAVE_NO_MEMORY(new_name);
+ if (new_name == NULL) {
+ TALLOC_FREE(old_name);
+ return WERR_NOMEM;
+ }
if (version != -1 && (version = file_version_is_newer(conn, old_name, new_name)) > 0) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list