Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8287
Modified Files:
Tag: Nov2009
monetdb.c
Log Message:
fix segfault when -h -p -P options are given but no command
U monetdb.c
Index: monetdb.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb.c,v
retrieving revision 1.65.2.4
retrieving revision 1.65.2.5
diff -u -d -r1.65.2.4 -r1.65.2.5
--- monetdb.c 30 Sep 2009 14:20:07 -0000 1.65.2.4
+++ monetdb.c 8 Oct 2009 08:55:08 -0000 1.65.2.5
@@ -1403,6 +1403,12 @@
mero_port = 50001;
}
+ /* see if we still have arguments at this stage */
+ if (i >= argc) {
+ command_help(0, NULL);
+ return(1);
+ }
+
/* commands that do not need merovingian to be running */
if (strcmp(argv[i], "help") == 0 || strcmp(argv[i], "--help") == 0) {
command_help(argc - i, &argv[i]);
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
