From: Michal Schmidt <mschmidt@redhat.com>
Date: Wed, 9 May 2012 09:13:26 +0000 (+0200)
Subject: main: fix assertion failure due to use of ELEMENTSOF on a non-array
X-Git-Tag: v183~130
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e564a98237817d8c89f7979856a87d3788988742;ds=sidebyside

main: fix assertion failure due to use of ELEMENTSOF on a non-array
---

diff --git a/src/core/main.c b/src/core/main.c
index d7ce8abda..be9d0a60e 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1640,7 +1640,7 @@ finish:
 
         if (reexecute) {
                 const char **args;
-                unsigned i;
+                unsigned i, args_size;
 
                 /* Close and disarm the watchdog, so that the new
                  * instance can reinitialize it, but doesn't get
@@ -1650,7 +1650,8 @@ finish:
                 if (switch_root)
                         do_switch_root(switch_root);
 
-                args = newa(const char*, MAX(5, argc+1));
+                args_size = MAX(5, argc+1);
+                args = newa(const char*, args_size);
 
                 if (!switch_root_init) {
                         char sfd[16];
@@ -1673,7 +1674,7 @@ finish:
                         args[i++] = sfd;
                         args[i++] = NULL;
 
-                        assert(i <= ELEMENTSOF(args));
+                        assert(i <= args_size);
                         execv(args[0], (char* const*) args);
                 }
 
@@ -1695,7 +1696,7 @@ finish:
                         args[i++] = argv[j];
                 args[i++] = NULL;
 
-                assert(i <= ELEMENTSOF(args));
+                assert(i <= args_size);
                 execv(args[0], (char* const*) args);
 
                 log_error("Failed to reexecute: %m");