diff options
author | Jaehyun Kim <jeik01.kim@samsung.com> | 2020-11-11 11:30:56 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@review> | 2020-11-11 11:30:56 +0000 |
commit | 33cdd54e34fcea201488aed301a31a204520b287 (patch) | |
tree | e48d9fac7e50721e364adb5885f9e06f3e22620a | |
parent | 0f1b235df50bb53099060b789aad8e8f6d7821b9 (diff) | |
parent | 0a6425147f6e3bd165c8302bdc3205fb958fd065 (diff) | |
download | connman-33cdd54e34fcea201488aed301a31a204520b287.tar.gz connman-33cdd54e34fcea201488aed301a31a204520b287.tar.bz2 connman-33cdd54e34fcea201488aed301a31a204520b287.zip |
Merge "Fix derefrencing of NULL pointer" into tizensubmit/tizen/20201127.052752submit/tizen/20201116.030352
-rw-r--r-- | packaging/connman.spec | 2 | ||||
-rwxr-xr-x | src/service.c | 3 |
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); |