From 6211c588d514efac018d071c4304df3f7bace3bd Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 5 Mar 2014 11:49:26 +0100 Subject: [PATCH] Check if p_routingTable is null in AsFull::~AsFull. --- src/surf/surf_routing_full.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp index 293b317497..980221ef58 100644 --- a/src/surf/surf_routing_full.cpp +++ b/src/surf/surf_routing_full.cpp @@ -54,17 +54,19 @@ AsFull::AsFull(){ } AsFull::~AsFull(){ - int table_size = (int)xbt_dynar_length(p_indexNetworkElm); - int i, j; - /* Delete routing table */ - for (i = 0; i < table_size; i++) - for (j = 0; j < table_size; j++) { - if (TO_ROUTE_FULL(i,j)){ - xbt_dynar_free(&TO_ROUTE_FULL(i,j)->link_list); - xbt_free(TO_ROUTE_FULL(i,j)); + if (p_routingTable) { + int table_size = (int)xbt_dynar_length(p_indexNetworkElm); + int i, j; + /* Delete routing table */ + for (i = 0; i < table_size; i++) + for (j = 0; j < table_size; j++) { + if (TO_ROUTE_FULL(i,j)){ + xbt_dynar_free(&TO_ROUTE_FULL(i,j)->link_list); + xbt_free(TO_ROUTE_FULL(i,j)); + } } - } - xbt_free(p_routingTable); + xbt_free(p_routingTable); + } } xbt_dynar_t AsFull::getOneLinkRoutes() -- 2.20.1