浏览代码

src/core/perfmodel/perfmodel_history.c: check model->state is valid before accessing it

Nathalie Furmento 11 年之前
父节点
当前提交
6aa151a21f
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/core/perfmodel/perfmodel_history.c

+ 2 - 2
src/core/perfmodel/perfmodel_history.c

@@ -757,7 +757,7 @@ void _starpu_initialize_registered_performance_models(void)
 
 
 void _starpu_deinitialize_performance_model(struct starpu_perfmodel *model)
 void _starpu_deinitialize_performance_model(struct starpu_perfmodel *model)
 {
 {
-	if(model->state->is_init && model->state->per_arch != NULL)
+	if(model->state && model->state->is_init && model->state->per_arch != NULL)
 	{
 	{
 		int ncombs = model->state->ncombs;
 		int ncombs = model->state->ncombs;
 		int comb, impl;
 		int comb, impl;
@@ -807,7 +807,7 @@ void _starpu_deinitialize_performance_model(struct starpu_perfmodel *model)
 		model->state->ncombs = 0;
 		model->state->ncombs = 0;
 	}
 	}
 
 
-	model->state->is_init = 0;
+	if (model->state) model->state->is_init = 0;
 	model->is_loaded = 0;
 	model->is_loaded = 0;
 }
 }