From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 22 May 2012 11:58:37 +0000 (+0200)
Subject: Ensure that lfields[] is fully initialized.
X-Git-Tag: v3_8~696
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d34cb01da6a26cc35b4cd0cce1c8c3a62094e894

Ensure that lfields[] is fully initialized.

Fixes compilation error:

In file included from .../src/xbt/mmalloc/mm.c:24:0:
.../src/xbt/mmalloc/mm_diff.c: In function ‘get_addr_memory_map’:
.../src/xbt/mmalloc/mm_diff.c:373:9: error: ‘lfields[5]’ may be used uninitialized in this function [-Werror=uninitialized]
cc1: all warnings being treated as errors

In fact, once strtok returns NULL, subsequent searches with the same parameters
return NULL too.
---

diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index c8bc05adfa..a2e29b6f6d 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -353,7 +353,7 @@ const char* get_addr_memory_map(void *addr, void* s_heap, void* r_heap){
 
     lfields[0] = strtok(line, " ");
 
-    for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) {
+    for (i = 1; i < 6; i++) {
       lfields[i] = strtok(NULL, " ");
     }