diff options
| author | Jaehyun Kim <jeik01.kim@samsung.com> | 2019-10-08 00:43:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2019-10-08 00:43:00 +0000 |
| commit | a0f324b387847f5b13b59ace15de5ecb48f25e1a (patch) | |
| tree | 00dfc1fdd198789715338ca86e637b4e9ff67dc3 | |
| parent | b7ff33d7bc0b2b6efaf8e2f0c69c75b8efbc2490 (diff) | |
| parent | 4b56bbc05a7e48de6209d03280c60bf53fceb91f (diff) | |
| download | connman-a0f324b387847f5b13b59ace15de5ecb48f25e1a.tar.gz connman-a0f324b387847f5b13b59ace15de5ecb48f25e1a.tar.bz2 connman-a0f324b387847f5b13b59ace15de5ecb48f25e1a.zip | |
Merge "[Fix] Dereference after free in sta_remove_callback()" into tizen
| -rw-r--r-- | packaging/connman.spec | 2 | ||||
| -rw-r--r-- | plugins/wifi.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec index af8e27f0..a2774df4 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -5,7 +5,7 @@ Name: connman Version: 1.37 -Release: 33 +Release: 34 License: GPL-2.0+ Summary: Connection Manager Url: http://connman.net diff --git a/plugins/wifi.c b/plugins/wifi.c index e74e2d9b..322cfa0a 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -5498,16 +5498,24 @@ static void sta_remove_callback(int result, if ((result < 0) || (info->wifi->ap_supported != WIFI_AP_SUPPORTED)) { info->wifi->tethering = false; connman_technology_tethering_notify(info->technology, false); +#if !defined TIZEN_EXT g_free(info->ifname); g_free(info->ssid); g_free(info); +#endif /* !defined TIZEN_EXT */ if (info->wifi->ap_supported == WIFI_AP_SUPPORTED) { g_free(info->wifi->tethering_param->ssid); g_free(info->wifi->tethering_param); info->wifi->tethering_param = NULL; } +#if defined TIZEN_EXT + + g_free(info->ifname); + g_free(info->ssid); + g_free(info); +#endif /* defined TIZEN_EXT */ return; } |