diff options
| author | Gerald Carter <jerry@samba.org> | 2006-06-19 12:13:46 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-06-19 12:13:46 +0000 |
| commit | aa39f8aeab4ff08fd083cf913576f24104b08fde (patch) | |
| tree | 46d96c9a35a003803628e032f24de9146dc944e7 /source/rpcclient | |
| parent | a1dd753bc22fb9fe98e146078f9e45b972c69fe0 (diff) | |
| download | samba-aa39f8aeab4ff08fd083cf913576f24104b08fde.tar.gz samba-aa39f8aeab4ff08fd083cf913576f24104b08fde.tar.xz samba-aa39f8aeab4ff08fd083cf913576f24104b08fde.zip | |
r16348: * merging changes from SAMBA_3_0 r16346
* updating release notes to match
Diffstat (limited to 'source/rpcclient')
| -rw-r--r-- | source/rpcclient/cmd_samr.c | 13 | ||||
| -rw-r--r-- | source/rpcclient/cmd_spoolss.c | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c index cbf638e7e62..1a204e70bc7 100644 --- a/source/rpcclient/cmd_samr.c +++ b/source/rpcclient/cmd_samr.c @@ -1680,7 +1680,12 @@ static NTSTATUS cmd_samr_lookup_names(struct rpc_pipe_client *cli, /* Look up names */ num_names = argc - 2; - names = TALLOC_ARRAY(mem_ctx, const char *, num_names); + if ((names = TALLOC_ARRAY(mem_ctx, const char *, num_names)) == NULL) { + rpccli_samr_close(cli, mem_ctx, &domain_pol); + rpccli_samr_close(cli, mem_ctx, &connect_pol); + result = NT_STATUS_NO_MEMORY; + goto done; + } for (i = 0; i < argc - 2; i++) names[i] = argv[i + 2]; @@ -1747,6 +1752,12 @@ static NTSTATUS cmd_samr_lookup_rids(struct rpc_pipe_client *cli, num_rids = argc - 2; rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids); + if ((rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids)) == NULL) { + rpccli_samr_close(cli, mem_ctx, &domain_pol); + rpccli_samr_close(cli, mem_ctx, &connect_pol); + result = NT_STATUS_NO_MEMORY; + goto done; + } for (i = 0; i < argc - 2; i++) sscanf(argv[i + 2], "%i", &rids[i]); diff --git a/source/rpcclient/cmd_spoolss.c b/source/rpcclient/cmd_spoolss.c index f04b6a8ec9f..7f8bbbcd8c9 100644 --- a/source/rpcclient/cmd_spoolss.c +++ b/source/rpcclient/cmd_spoolss.c @@ -2454,6 +2454,10 @@ static WERROR cmd_spoolss_rffpcnex(struct rpc_pipe_client *cli, option.count = option.ctr.count = 2; option.ctr.type = TALLOC_ARRAY(mem_ctx, SPOOL_NOTIFY_OPTION_TYPE, 2); + if (option.ctr.type == NULL) { + result = WERR_NOMEM; + goto done; + } ZERO_STRUCT(option.ctr.type[0]); option.ctr.type[0].type = PRINTER_NOTIFY_TYPE; |