svn commit: samba r26433 - in branches/SAMBA_4_0: . source/param

jelmer at samba.org jelmer at samba.org
Thu Dec 13 22:46:31 GMT 2007


Author: jelmer
Date: 2007-12-13 22:46:30 +0000 (Thu, 13 Dec 2007)
New Revision: 26433

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26433

Log:
Don't crash when a NULL lp_ctx is specified to a lp_parm_* function.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/param/loadparm.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2007-12-13 22:46:27 UTC (rev 26432)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2007-12-13 22:46:30 UTC (rev 26433)
@@ -764,6 +764,9 @@
 {
 	char *vfskey;
         struct param_opt *data;
+
+	if (lp_ctx == NULL)
+		return NULL;
 	
 	data = (service == NULL ? lp_ctx->globals->param_opt : service->param_opt);
     



More information about the samba-cvs mailing list