Skip to content
Permalink
Browse files
Fixes memory leaks in linked_list and link_list_test
In cases where an entry was removed but only the entry's data was
returned, the removed entry would be orphaned and never freed.

Also, fixes several memory leaks in the tests for linked_list.
  • Loading branch information
bblough committed May 10, 2018
1 parent e24a9a7 commit 86e775942f999e3ff1c101ea01821b1a8b04ffa7
Showing 2 changed files with 59 additions and 35 deletions.
@@ -283,7 +283,9 @@ axutil_linked_list_remove_first(
linked_list->last = NULL;
}

entry_t * orphan = linked_list->first;
linked_list->first = linked_list->first->next;
AXIS2_FREE(env->allocator, orphan);

return r;
}
@@ -314,7 +316,9 @@ axutil_linked_list_remove_last(
linked_list->first = NULL;
}

entry_t * orphan = linked_list->last;
linked_list->last = linked_list->last->previous;
AXIS2_FREE(env->allocator, orphan);

return r;
}
@@ -507,7 +511,9 @@ axutil_linked_list_remove_at_index(
axutil_linked_list_check_bounds_exclusive(linked_list, env, index);
e = axutil_linked_list_get_entry(linked_list, env, index);
axutil_linked_list_remove_entry(linked_list, env, e);
return e->data;
void *data = e->data;
AXIS2_FREE(env->allocator, e);
return data;
}

AXIS2_EXTERN int AXIS2_CALL
@@ -1,19 +1,19 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include <gtest/gtest.h>

@@ -60,55 +60,73 @@ TEST_F(TestLinkedList, test_link_list)

axutil_linked_list_t * linked_list = NULL;
int index_of_item;
int index_of_last_item;
entry_t * entry;
void *get_item;
axis2_status_t status;
axis2_bool_t bresult;
void **array_from_list;

linked_list = axutil_linked_list_create(m_env);
int index_of_last_item;
entry_t * entry;
void *get_item;
axis2_status_t status;
axis2_bool_t bresult;
void **array_from_list;

linked_list = axutil_linked_list_create(m_env);
ASSERT_NE(linked_list, nullptr);

status = axutil_linked_list_add_first(linked_list,m_env,(void *)first_item);
ASSERT_EQ(status, AXIS2_SUCCESS);

bresult = axutil_linked_list_contains(linked_list,m_env,(void *)second_item);
ASSERT_EQ(bresult, AXIS2_FALSE);
ASSERT_EQ(bresult, AXIS2_FALSE);

status = axutil_linked_list_add(linked_list,m_env,(void *)third_item);
ASSERT_EQ(status, AXIS2_SUCCESS);

status = axutil_linked_list_add_last(linked_list,m_env,(void *)last_item);
ASSERT_EQ(status, AXIS2_SUCCESS);
ASSERT_EQ(axutil_linked_list_size(linked_list,m_env), 3);
ASSERT_EQ(axutil_linked_list_size(linked_list,m_env), 3);

index_of_item = axutil_linked_list_index_of(linked_list,m_env,third_item);
ASSERT_EQ(index_of_item, 1);

index_of_last_item = axutil_linked_list_last_index_of(linked_list,m_env,last_item);
ASSERT_EQ(index_of_last_item, 2);

entry = axutil_linked_list_get_entry(linked_list,m_env,0);
ASSERT_NE(entry, nullptr);

get_item = axutil_linked_list_get(linked_list,m_env,1);
ASSERT_NE(get_item, nullptr);
ASSERT_EQ(strcmp((char*)get_item, third_item), 0);
ASSERT_STREQ((char*)get_item, third_item);

get_item = axutil_linked_list_set(linked_list,m_env,1,(void *)array);
ASSERT_NE(get_item, nullptr);
ASSERT_EQ(strcmp((char*)get_item, third_item), 0);
ASSERT_STREQ((char*)get_item, third_item);

array_from_list = axutil_linked_list_to_array(linked_list,m_env);
ASSERT_NE(array_from_list, nullptr);
ASSERT_NE(array_from_list, nullptr);

status = axutil_linked_list_add_at_index(linked_list,m_env,1,(void *)second_item);
ASSERT_EQ(status, AXIS2_SUCCESS);

get_item = axutil_linked_list_remove_at_index(linked_list,m_env,1);
ASSERT_NE(get_item, nullptr);
ASSERT_NE(get_item, nullptr);

bresult = axutil_linked_list_check_bounds_inclusive(linked_list,m_env,1);
ASSERT_EQ(bresult, AXIS2_TRUE);
ASSERT_EQ(bresult, AXIS2_TRUE);

status = axutil_linked_list_remove_entry(linked_list,m_env,entry);
ASSERT_EQ(status, AXIS2_SUCCESS);
AXIS2_FREE(m_allocator, entry);

get_item = axutil_linked_list_remove_first(linked_list,m_env);
ASSERT_NE(get_item, nullptr);
ASSERT_NE(get_item, nullptr);

get_item = axutil_linked_list_remove_last(linked_list,m_env);
ASSERT_NE(get_item, nullptr);
ASSERT_EQ(axutil_linked_list_size(linked_list,m_env), 0);
ASSERT_NE(get_item, nullptr);
ASSERT_EQ(axutil_linked_list_size(linked_list,m_env), 0);

bresult = axutil_linked_list_remove(linked_list,m_env,(void *)third_item);
ASSERT_EQ(bresult, AXIS2_FALSE);
ASSERT_EQ(bresult, AXIS2_FALSE);

axutil_linked_list_free(linked_list,m_env);
AXIS2_FREE(m_allocator, array_from_list);
}

0 comments on commit 86e7759

Please sign in to comment.