diff options
author | Christopher Faylor <me@cgf.cx> | 2005-08-08 23:46:48 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2005-08-08 23:46:48 +0400 |
commit | c9508cb4ecd076d3b9d6cdf75befe9743907b522 (patch) | |
tree | 362ee38b74874153c5d69fefc40fa364ef88a925 | |
parent | d4c8f095ba17f14aa4f206a706496ed19d897a34 (diff) |
* cygserver.cc (main): Call wincap.init() earlier to avoid a NULL dereference.
-rw-r--r-- | winsup/cygserver/ChangeLog | 5 | ||||
-rw-r--r-- | winsup/cygserver/cygserver.cc | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog index 6ec8da4aa..7fcee976e 100644 --- a/winsup/cygserver/ChangeLog +++ b/winsup/cygserver/ChangeLog @@ -1,3 +1,8 @@ +2005-08-08 Christopher Faylor <cgf@timesys.com> + + * cygserver.cc (main): Call wincap.init() earlier to avoid a NULL + dereference. + 2005-06-14 Corinna Vinschen <corinna@vinschen.de> * sysv_sem.cc (semu_list): Define static to avoid gcc 4.x compiler diff --git a/winsup/cygserver/cygserver.cc b/winsup/cygserver/cygserver.cc index 5cf82f38e..d19f1755c 100644 --- a/winsup/cygserver/cygserver.cc +++ b/winsup/cygserver/cygserver.cc @@ -567,6 +567,8 @@ main (const int argc, char *argv[]) int opt; + wincap.init (); + opterr = 0; while ((opt = getopt_long (argc, argv, opts, longopts, NULL)) != EOF) switch (opt) @@ -701,7 +703,6 @@ main (const int argc, char *argv[]) if (support_semaphores == TUN_UNDEF) support_semaphores = TUN_TRUE; - wincap.init (); if (wincap.has_security () && !setup_privileges ()) panic ("Setting process privileges failed."); |