summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-01-23 20:57:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:44:17 -0500
commita80732cf0010404ef52f9ba05fd6e318461ae375 (patch)
tree1fc7cfdf50b555d01d621cd410eac924ebeef1a6 /source4
parent0602d4d7f2070af8dfbf364db3e4008091a188fe (diff)
downloadsamba-a80732cf0010404ef52f9ba05fd6e318461ae375.tar.gz
samba-a80732cf0010404ef52f9ba05fd6e318461ae375.tar.bz2
samba-a80732cf0010404ef52f9ba05fd6e318461ae375.zip
r20983: Two no-mem error returns
(This used to be commit 79a0cd3a1bbd3d4ef0c335f398fa8bb8e82c8624)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/common/notify.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c
index 5954a7ebe2..91fa8a1d78 100644
--- a/source4/ntvfs/common/notify.c
+++ b/source4/ntvfs/common/notify.c
@@ -213,6 +213,7 @@ static NTSTATUS notify_save(struct notify_context *notify)
}
tmp_ctx = talloc_new(notify);
+ NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
status = ndr_push_struct_blob(&blob, tmp_ctx, notify->array,
(ndr_push_flags_fn_t)ndr_push_notify_array);
@@ -246,6 +247,10 @@ static void notify_handler(struct messaging_context *msg_ctx, void *private_data
TALLOC_CTX *tmp_ctx = talloc_new(notify);
struct notify_list *listel;
+ if (tmp_ctx == NULL) {
+ return;
+ }
+
status = ndr_pull_struct_blob(data, tmp_ctx, &ev,
(ndr_pull_flags_fn_t)ndr_pull_notify_event);
if (!NT_STATUS_IS_OK(status)) {