diff options
| author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2011-04-12 11:31:44 +0200 |
|---|---|---|
| committer | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2011-04-12 15:27:43 +0200 |
| commit | ead53fb8c47b2b0a3370fc396e020c14fc169749 (patch) | |
| tree | f886e1de84e768e74f145dc68892bf4395626607 /src/session.c | |
| parent | c7bf0a4caeb19088dd3d1a1190a769387574e5dc (diff) | |
| download | connman-ead53fb8c47b2b0a3370fc396e020c14fc169749.tar.gz connman-ead53fb8c47b2b0a3370fc396e020c14fc169749.tar.bz2 connman-ead53fb8c47b2b0a3370fc396e020c14fc169749.zip | |
session: session2bearer return "" instead NULL
If an invalid bearer name is used, e.g. ethenret instead of ethernet
then session->name will be a NULL pointer. Appending a NULL string
with connman_dbus_property_append_basic is not allowed.
Diffstat (limited to 'src/session.c')
| -rw-r--r-- | src/session.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/session.c b/src/session.c index c4edfd4f..d51eb678 100644 --- a/src/session.c +++ b/src/session.c @@ -145,10 +145,10 @@ static char *service2bearer(enum connman_service_type type) case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: case CONNMAN_SERVICE_TYPE_GADGET: - return NULL; + return ""; } - return NULL; + return ""; } static char *session2bearer(struct connman_session *session) @@ -158,7 +158,7 @@ static char *session2bearer(struct connman_session *session) enum connman_service_type type; if (session->service == NULL) - return NULL; + return ""; type = connman_service_get_type(session->service); @@ -175,7 +175,7 @@ static char *session2bearer(struct connman_session *session) return service2bearer(type); } - return NULL; + return ""; } |