sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

r9826: Add some more OOM checks

Browse Source
This commit is contained in:
Jelmer Vernooij 2005-08-31 14:26:20 +00:00 committed by Gerald (Jerry) Carter
parent edf380cb5f
commit 213bcb7e16
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/param/generic.c
View File

@ -68,6 +68,9 @@ static struct param *param_get_add(struct param_context *ctx, const char *sectio
if (section == NULL) { if (section == NULL) {
section = talloc_zero(ctx, struct param_section); section = talloc_zero(ctx, struct param_section);
if (section == NULL)
return NULL;
section->name = talloc_strdup(section, section_name); section->name = talloc_strdup(section, section_name);
DLIST_ADD(ctx->sections, section); DLIST_ADD(ctx->sections, section);
} }
@ -75,6 +78,9 @@ static struct param *param_get_add(struct param_context *ctx, const char *sectio
p = param_section_get(section, name); p = param_section_get(section, name);
if (p == NULL) { if (p == NULL) {
p = talloc_zero(section, struct param); p = talloc_zero(section, struct param);
if (p == NULL)
return NULL;
p->name = talloc_strdup(p, name); p->name = talloc_strdup(p, name);
DLIST_ADD(section->parameters, p); DLIST_ADD(section->parameters, p);
} }
@ -146,6 +152,9 @@ void param_set_int(struct param_context *ctx, const char *section, const char *p
{ {
struct param *p = param_get_add(ctx, section, param); struct param *p = param_get_add(ctx, section, param);
if (!p)
return;
p->value = talloc_asprintf(p, "%d", value); p->value = talloc_asprintf(p, "%d", value);
} }
@ -163,6 +172,9 @@ void param_set_ulong(struct param_context *ctx, const char *section, const char
{ {
struct param *p = param_get_add(ctx, section, name); struct param *p = param_get_add(ctx, section, name);
if (!p)
return;
p->value = talloc_asprintf(p, "%lu", value); p->value = talloc_asprintf(p, "%lu", value);
} }
@ -173,6 +185,9 @@ static BOOL param_sfunc (const char *name, void *_ctx)
if (section == NULL) { if (section == NULL) {
section = talloc_zero(ctx, struct param_section); section = talloc_zero(ctx, struct param_section);
if (section == NULL)
return False;
section->name = talloc_strdup(section, name); section->name = talloc_strdup(section, name);
DLIST_ADD(ctx->sections, section); DLIST_ADD(ctx->sections, section);
@ -191,6 +206,9 @@ static BOOL param_pfunc (const char *name, const char *value, void *_ctx)
if (!p) { if (!p) {
p = talloc_zero(ctx->sections, struct param); p = talloc_zero(ctx->sections, struct param);
if (p == NULL)
return False;
p->name = talloc_strdup(p, name); p->name = talloc_strdup(p, name);
p->value = talloc_strdup(p, value); p->value = talloc_strdup(p, value);
DLIST_ADD(ctx->sections->parameters, p); DLIST_ADD(ctx->sections->parameters, p);
@ -211,8 +229,10 @@ struct param_context *param_init(TALLOC_CTX *mem_ctx)
int param_read(struct param_context *ctx, const char *fn) int param_read(struct param_context *ctx, const char *fn)
{ {
ctx->sections = talloc_zero(ctx, struct param_section); ctx->sections = talloc_zero(ctx, struct param_section);
if (ctx->sections == NULL)
return -1;
ctx->sections->name = talloc_strdup(ctx->sections, "global"); ctx->sections->name = talloc_strdup(ctx->sections, "global");
if (!pm_process( fn, param_sfunc, param_pfunc, ctx)) { if (!pm_process( fn, param_sfunc, param_pfunc, ctx)) {
return -1; return -1;
} }

4
source/scripting/ejs/smbcalls_param.c
View File

@ -70,7 +70,7 @@ static int ejs_param_get_list(MprVarHandle eid, int argc, char **argv)
const char **ret; const char **ret;
if (argc != 1 && argc != 2) { if (argc != 1 && argc != 2) {
ejsSetErrorMsg(eid, "param.get invalid argument count"); ejsSetErrorMsg(eid, "param.get_list invalid argument count");
return -1; return -1;
} }
@ -83,7 +83,7 @@ static int ejs_param_get_list(MprVarHandle eid, int argc, char **argv)
ret = param_get_string_list(ctx, NULL, argv[0], NULL); ret = param_get_string_list(ctx, NULL, argv[0], NULL);
} }
if (ret) { if (ret != NULL) {
mpr_Return(eid, mprList("array", ret)); mpr_Return(eid, mprList("array", ret));
} else { } else {
mpr_Return(eid, mprCreateUndefinedVar()); mpr_Return(eid, mprCreateUndefinedVar());