From ead53fb8c47b2b0a3370fc396e020c14fc169749 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Tue, 12 Apr 2011 11:31:44 +0200 Subject: [PATCH] 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. --- src/session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/session.c b/src/session.c index c4edfd4..d51eb67 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 ""; } -- 2.7.4