Fix: Memory leak issue when tokenizing string

[platform/upstream/connman.git] / unit / test-ippool.c

diff --git a/unit/test-ippool.c b/unit/test-ippool.c
old mode 100644 (file)
new mode 100755 (executable)
index e5c08ca..a6cae65
--- a/unit/test-ippool.c
+++ b/unit/test-ippool.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2012  BWM CarIT GmbH. All rights reserved.
+ *  Copyright (C) 2012-2014  BMW Car IT GmbH.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -47,13 +47,13 @@ static void test_case_1(void)
        __connman_ippool_init();
 
        pool = __connman_ippool_create(23, 1, 500, NULL, NULL);
-       g_assert(pool == NULL);
+       g_assert(!pool);
 
        for (i = 0; i < 100000; i++) {
                pool = __connman_ippool_create(23, 1, 20, NULL, NULL);
                g_assert(pool);
 
-               __connman_ippool_unref(pool);
+               __connman_ippool_free(pool);
        }
 
        __connman_ippool_cleanup();
@@ -92,7 +92,7 @@ static void test_case_2(void)
                        "\tgateway %s broadcast %s mask %s", start_ip, end_ip,
                        gateway, broadcast, subnet_mask);
 
-               __connman_ippool_unref(pool);
+               __connman_ippool_free(pool);
        }
 
        __connman_ippool_cleanup();
@@ -131,7 +131,7 @@ static void test_case_3(void)
 
        while (TRUE) {
                pool = __connman_ippool_create(23, 1, 100, NULL, NULL);
-               if (pool == NULL)
+               if (!pool)
                        break;
                i += 1;
 
@@ -154,10 +154,10 @@ static void test_case_3(void)
 
        LOG("Number of blocks %d", i);
 
-       for (it = list; it != NULL; it = it->next) {
+       for (it = list; it; it = it->next) {
                pool = it->data;
 
-               __connman_ippool_unref(pool);
+               __connman_ippool_free(pool);
        }
 
        g_slist_free(list);
@@ -219,7 +219,7 @@ static void test_case_4(void)
 
        g_assert(flag == 1);
 
-       __connman_ippool_unref(pool);
+       __connman_ippool_free(pool);
 
        flag = 0;
 
@@ -246,14 +246,14 @@ static void test_case_4(void)
 
        g_assert(flag == 1);
 
-       __connman_ippool_unref(pool);
+       __connman_ippool_free(pool);
 
        __connman_ippool_cleanup();
 }
 
 static void test_case_5(void)
 {
-       struct connman_ippool *pool;
+       struct connman_ippool *pool1, *pool2;
        const char *gateway;
        const char *broadcast;
        const char *subnet_mask;
@@ -271,14 +271,14 @@ static void test_case_5(void)
        g_assert(flag == 0);
 
        /* pool should return 192.168.0.1 now */
-       pool = __connman_ippool_create(26, 1, 100, collision_cb, &flag);
-       g_assert(pool);
+       pool1 = __connman_ippool_create(26, 1, 100, collision_cb, &flag);
+       g_assert(pool1);
 
-       gateway = __connman_ippool_get_gateway(pool);
-       broadcast = __connman_ippool_get_broadcast(pool);
-       subnet_mask = __connman_ippool_get_subnet_mask(pool);
-       start_ip = __connman_ippool_get_start_ip(pool);
-       end_ip = __connman_ippool_get_end_ip(pool);
+       gateway = __connman_ippool_get_gateway(pool1);
+       broadcast = __connman_ippool_get_broadcast(pool1);
+       subnet_mask = __connman_ippool_get_subnet_mask(pool1);
+       start_ip = __connman_ippool_get_start_ip(pool1);
+       end_ip = __connman_ippool_get_end_ip(pool1);
 
        g_assert(gateway);
        g_assert(broadcast);
@@ -296,8 +296,6 @@ static void test_case_5(void)
                "\tgateway %s broadcast %s mask %s", start_ip, end_ip,
                gateway, broadcast, subnet_mask);
 
-       __connman_ippool_unref(pool);
-
        /*
         * Now create the pool again, we should not get collision
         * with existing allocated address.
@@ -305,14 +303,14 @@ static void test_case_5(void)
 
        /* pool should return 192.168.2.1 now */
        flag = 0;
-       pool = __connman_ippool_create(23, 1, 100, collision_cb, &flag);
-       g_assert(pool);
+       pool2 = __connman_ippool_create(23, 1, 100, collision_cb, &flag);
+       g_assert(pool2);
 
-       gateway = __connman_ippool_get_gateway(pool);
-       broadcast = __connman_ippool_get_broadcast(pool);
-       subnet_mask = __connman_ippool_get_subnet_mask(pool);
-       start_ip = __connman_ippool_get_start_ip(pool);
-       end_ip = __connman_ippool_get_end_ip(pool);
+       gateway = __connman_ippool_get_gateway(pool2);
+       broadcast = __connman_ippool_get_broadcast(pool2);
+       subnet_mask = __connman_ippool_get_subnet_mask(pool2);
+       start_ip = __connman_ippool_get_start_ip(pool2);
+       end_ip = __connman_ippool_get_end_ip(pool2);
 
        g_assert(gateway);
        g_assert(broadcast);
@@ -332,14 +330,15 @@ static void test_case_5(void)
 
        g_assert(flag == 0);
 
-       __connman_ippool_unref(pool);
+       __connman_ippool_free(pool1);
+       __connman_ippool_free(pool2);
 
        __connman_ippool_cleanup();
 }
 
 static void test_case_6(void)
 {
-       struct connman_ippool *pool;
+       struct connman_ippool *pool1, *pool2;
        const char *gateway;
        const char *broadcast;
        const char *subnet_mask;
@@ -362,14 +361,14 @@ static void test_case_6(void)
        g_assert(flag == 0);
 
        /* pool should return 192.168.2.1 now */
-       pool = __connman_ippool_create(26, 1, 100, collision_cb, &flag);
-       g_assert(pool);
+       pool1 = __connman_ippool_create(26, 1, 100, collision_cb, &flag);
+       g_assert(pool1);
 
-       gateway = __connman_ippool_get_gateway(pool);
-       broadcast = __connman_ippool_get_broadcast(pool);
-       subnet_mask = __connman_ippool_get_subnet_mask(pool);
-       start_ip = __connman_ippool_get_start_ip(pool);
-       end_ip = __connman_ippool_get_end_ip(pool);
+       gateway = __connman_ippool_get_gateway(pool1);
+       broadcast = __connman_ippool_get_broadcast(pool1);
+       subnet_mask = __connman_ippool_get_subnet_mask(pool1);
+       start_ip = __connman_ippool_get_start_ip(pool1);
+       end_ip = __connman_ippool_get_end_ip(pool1);
 
        g_assert(gateway);
        g_assert(broadcast);
@@ -387,8 +386,6 @@ static void test_case_6(void)
                "\tgateway %s broadcast %s mask %s", start_ip, end_ip,
                gateway, broadcast, subnet_mask);
 
-       __connman_ippool_unref(pool);
-
        /*
         * Now create the pool again, we should not get collision
         * with existing allocated address.
@@ -396,14 +393,14 @@ static void test_case_6(void)
 
        /* pool should return 192.168.3.1 now */
        flag = 0;
-       pool = __connman_ippool_create(23, 1, 100, collision_cb, &flag);
-       g_assert(pool);
+       pool2 = __connman_ippool_create(23, 1, 100, collision_cb, &flag);
+       g_assert(pool2);
 
-       gateway = __connman_ippool_get_gateway(pool);
-       broadcast = __connman_ippool_get_broadcast(pool);
-       subnet_mask = __connman_ippool_get_subnet_mask(pool);
-       start_ip = __connman_ippool_get_start_ip(pool);
-       end_ip = __connman_ippool_get_end_ip(pool);
+       gateway = __connman_ippool_get_gateway(pool2);
+       broadcast = __connman_ippool_get_broadcast(pool2);
+       subnet_mask = __connman_ippool_get_subnet_mask(pool2);
+       start_ip = __connman_ippool_get_start_ip(pool2);
+       end_ip = __connman_ippool_get_end_ip(pool2);
 
        g_assert(gateway);
        g_assert(broadcast);
@@ -428,7 +425,8 @@ static void test_case_6(void)
        __connman_ippool_newaddr(25, start_ip, 24);
        g_assert(flag == 1);
 
-       __connman_ippool_unref(pool);
+       __connman_ippool_free(pool1);
+       __connman_ippool_free(pool2);
 
        __connman_ippool_cleanup();
 }