svn commit: samba r24845 - in branches: SAMBA_3_2/source/utils
SAMBA_3_2_0/source/utils
obnox at samba.org
obnox at samba.org
Fri Aug 31 15:34:27 GMT 2007
Author: obnox
Date: 2007-08-31 15:34:26 +0000 (Fri, 31 Aug 2007)
New Revision: 24845
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24845
Log:
Fix a segfault in smbcontrol when called with parameters but no extra args.
Michael
Modified:
branches/SAMBA_3_2/source/utils/smbcontrol.c
branches/SAMBA_3_2_0/source/utils/smbcontrol.c
Changeset:
Modified: branches/SAMBA_3_2/source/utils/smbcontrol.c
===================================================================
--- branches/SAMBA_3_2/source/utils/smbcontrol.c 2007-08-31 15:29:38 UTC (rev 24844)
+++ branches/SAMBA_3_2/source/utils/smbcontrol.c 2007-08-31 15:34:26 UTC (rev 24845)
@@ -1335,11 +1335,13 @@
argv = (const char **)poptGetArgs(pc);
argc = 0;
- while (argv[argc] != NULL) {
- argc++;
+ if (argv != NULL) {
+ while (argv[argc] != NULL) {
+ argc++;
+ }
}
- if (argc == 1)
+ if (argc <= 1)
usage(pc);
lp_load(dyn_CONFIGFILE,False,False,False,True);
Modified: branches/SAMBA_3_2_0/source/utils/smbcontrol.c
===================================================================
--- branches/SAMBA_3_2_0/source/utils/smbcontrol.c 2007-08-31 15:29:38 UTC (rev 24844)
+++ branches/SAMBA_3_2_0/source/utils/smbcontrol.c 2007-08-31 15:34:26 UTC (rev 24845)
@@ -1335,11 +1335,13 @@
argv = (const char **)poptGetArgs(pc);
argc = 0;
- while (argv[argc] != NULL) {
- argc++;
+ if (argv != NULL) {
+ while (argv[argc] != NULL) {
+ argc++;
+ }
}
- if (argc == 1)
+ if (argc <= 1)
usage(pc);
lp_load(dyn_CONFIGFILE,False,False,False,True);
More information about the samba-cvs
mailing list