diff options
| author | Jeremy Allison <jra@samba.org> | 2007-09-27 22:55:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:31:01 -0500 |
| commit | 7fc3a0663c022a8dc86e166a5037620c01148392 (patch) | |
| tree | 09c57a9aafacafc03771069169e565f12daf492c /source3 | |
| parent | d7a4d51eadaa9c01fb91375e855db0bffe7dd2bd (diff) | |
| download | samba-7fc3a0663c022a8dc86e166a5037620c01148392.tar.gz samba-7fc3a0663c022a8dc86e166a5037620c01148392.tar.bz2 samba-7fc3a0663c022a8dc86e166a5037620c01148392.zip | |
r25389: Fix crash bug using DFS info struct uninitialized.
Jeremy.
(This used to be commit 993bd0995eadc134378e691ccd796074dc475741)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpc_server/srv_dfs_nt.c | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_dfs_nt.c b/source3/rpc_server/srv_dfs_nt.c index 37a9725828..6ed5dbd3b5 100644 --- a/source3/rpc_server/srv_dfs_nt.c +++ b/source3/rpc_server/srv_dfs_nt.c @@ -379,10 +379,34 @@ WERROR _dfs_GetInfo(pipes_struct *p, struct dfs_GetInfo *r) vfs_ChDir(p->conn,p->conn->connectpath); switch (r->in.level) { - case 1: ret = init_reply_dfs_info_1(ctx, jn, r->out.info->info1); break; - case 2: ret = init_reply_dfs_info_2(ctx, jn, r->out.info->info2); break; - case 3: ret = init_reply_dfs_info_3(ctx, jn, r->out.info->info3); break; - case 100: ret = init_reply_dfs_info_100(ctx, jn, r->out.info->info100); break; + case 1: + r->out.info->info1 = TALLOC_ZERO_P(ctx,struct dfs_Info1); + if (!r->out.info->info1) { + return WERR_NOMEM; + } + ret = init_reply_dfs_info_1(ctx, jn, r->out.info->info1); + break; + case 2: + r->out.info->info2 = TALLOC_ZERO_P(ctx,struct dfs_Info2); + if (!r->out.info->info2) { + return WERR_NOMEM; + } + ret = init_reply_dfs_info_2(ctx, jn, r->out.info->info2); + break; + case 3: + r->out.info->info3 = TALLOC_ZERO_P(ctx,struct dfs_Info3); + if (!r->out.info->info3) { + return WERR_NOMEM; + } + ret = init_reply_dfs_info_3(ctx, jn, r->out.info->info3); + break; + case 100: + r->out.info->info100 = TALLOC_ZERO_P(ctx,struct dfs_Info100); + if (!r->out.info->info100) { + return WERR_NOMEM; + } + ret = init_reply_dfs_info_100(ctx, jn, r->out.info->info100); + break; default: r->out.info->info1 = NULL; return WERR_INVALID_PARAM; |