git.samba.org
/
mdw
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bd25bc1
)
s4:param/loadparm.c - check for OOM
author
Matthias Dieter Wallnöfer
<mdw@samba.org>
Mon, 21 Mar 2011 09:25:52 +0000
(10:25 +0100)
committer
Matthias Dieter Wallnöfer
<mdw@samba.org>
Tue, 22 Mar 2011 18:04:49 +0000
(19:04 +0100)
Return NULL if the loadparm context hasn't been allocated
Reviewed-by: Jelmer
source4/param/loadparm.c
patch
|
blob
|
history
diff --git
a/source4/param/loadparm.c
b/source4/param/loadparm.c
index 186443662aa6798df1794cf766cb80a56b67dc36..49d2e1cf740d117bde5c29a76d6ae681d7a234e1 100644
(file)
--- a/
source4/param/loadparm.c
+++ b/
source4/param/loadparm.c
@@
-2533,6
+2533,9
@@
struct loadparm_context *loadparm_init_global(bool load_default)
if (global_loadparm_context == NULL) {
global_loadparm_context = loadparm_init(NULL);
}
+ if (global_loadparm_context == NULL) {
+ return NULL;
+ }
if (load_default && !global_loadparm_context->loaded) {
lpcfg_load_default(global_loadparm_context);
}