- if(current_var->address < start_data_libsimgrid)
- continue;
- offset = (char *)current_var->address - (char *)start_data_libsimgrid;
- addr_pointed = *((void **)((char *)data2 + offset));
- if((addr_pointed > start_plt_libsimgrid && addr_pointed < end_plt_libsimgrid) || (addr_pointed > std_heap && (char *)addr_pointed < (char *)std_heap + STD_HEAP_SIZE ))
- continue;
- res = xbt_malloc0(current_var->size);;
- memcpy(res, (char*)data2 + offset, current_var->size);
- xbt_strbuff_append(clear, (const char*)res);
- xbt_free(res);
- }
-
- xbt_dynar_foreach(mc_global_variables, cursor, current_var){
- if(current_var->address > start_data_libsimgrid)
- break;
- offset = (char *)current_var->address - (char *)start_data_binary;
- addr_pointed = *((void **)((char *)data1 + offset));
- if((addr_pointed > start_plt_binary && addr_pointed < end_plt_binary) || (addr_pointed > std_heap && (char *)addr_pointed < (char *)std_heap + STD_HEAP_SIZE ))
- continue;
- res = xbt_malloc0(current_var->size);;
- memcpy(res, (char*)data1 + offset, current_var->size);
- xbt_strbuff_append(clear, (const char*)res);
- xbt_free(res);
+ if(current_var->address < start_data_libsimgrid){ /* binary */
+ offset = (char *)current_var->address - (char *)start_data_binary;
+ addr_pointed = *((void **)((char *)data2 + offset));
+ if(((addr_pointed >= start_plt_binary && addr_pointed <= end_plt_binary)) || ((addr_pointed >= std_heap && (char *)addr_pointed <= (char *)std_heap + STD_HEAP_SIZE )))
+ continue;
+ res = xbt_malloc0(current_var->size + 1);
+ memset(res, 0, current_var->size + 1);
+ memcpy(res, (char*)data2 + offset, current_var->size);
+ }else{ /* libsimgrid */
+ offset = (char *)current_var->address - (char *)start_data_libsimgrid;
+ addr_pointed = *((void **)((char *)data1 + offset));
+ if((addr_pointed >= start_plt_libsimgrid && addr_pointed <= end_plt_libsimgrid) || (addr_pointed >= std_heap && (char *)addr_pointed <= (char *)std_heap + STD_HEAP_SIZE ))
+ continue;
+ res = xbt_malloc0(current_var->size + 1);
+ memset(res, 0, current_var->size + 1);
+ memcpy(res, (char*)data1 + offset, current_var->size);
+ }
+ if(res != NULL){
+ xbt_strbuff_append(clear, (const char*)res);
+ xbt_free(res);
+ res = NULL;
+ }