summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Kim <jeik01.kim@samsung.com>2020-11-11 20:00:54 +0900
committerJaehyun Kim <jeik01.kim@samsung.com>2020-11-11 20:16:43 +0900
commit0a6425147f6e3bd165c8302bdc3205fb958fd065 (patch)
tree38a571282af2b11f096aa42700cc11746fb81e28
parent5269bd59e8100c6883b3f6e5609f57f8034e3140 (diff)
downloadconnman-0a6425147f6e3bd165c8302bdc3205fb958fd065.tar.gz
connman-0a6425147f6e3bd165c8302bdc3205fb958fd065.tar.bz2
connman-0a6425147f6e3bd165c8302bdc3205fb958fd065.zip
Fix derefrencing of NULL pointer
In some cases network->device could be NULL which leads to crash Change-Id: I3cc5401b37fd48d8d702935bef7afa7e277222f2 Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>
-rw-r--r--packaging/connman.spec2
-rwxr-xr-xsrc/service.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec
index 072e8bf1..33b9ccfc 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -5,7 +5,7 @@
Name: connman
Version: 1.37
-Release: 49
+Release: 50
License: GPL-2.0+
Summary: Connection Manager
Url: http://connman.net
diff --git a/src/service.c b/src/service.c
index f77c8a58..dd4f1919 100755
--- a/src/service.c
+++ b/src/service.c
@@ -7657,6 +7657,9 @@ static int calculate_score_last_user_selection(struct connman_service *service)
struct tm* ref_timeinfo;
device = connman_network_get_device(service->network);
+ if (!device)
+ return 0;
+
last_user_selection_time = connman_device_get_last_user_selection_time(device);
last_user_selection_ident = connman_device_get_last_user_selection_ident(device);
frequency = connman_network_get_frequency(service->network);