From b6f6ca1caa0a0d1855847d47fd80af536d277143 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Mon, 26 Mar 2012 18:28:45 +0200
Subject: [PATCH] Be more defensive against broken parameters.

Don't crash unnecessarily if argv[argc] doesn't exist.
---
 src/xbt/log.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 0e78015267..b5fdebf24c 100644
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -568,8 +568,10 @@ void xbt_log_init(int *argc, char **argv)
       argv[j++] = argv[i];
     }
   }
-  argv[j] = NULL;
-  *argc = j;
+  if (j < *argc) {
+    argv[j] = NULL;
+    *argc = j;
+  }
 }
 
 static void log_cat_exit(xbt_log_category_t cat)
-- 
2.20.1