[PATCH v1 6/9] session: session2bearer return "" instead NULL

[Daniel Wagner]

From: Daniel Wagner <daniel.wag...@bmw-carit.de>

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 files 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 "";
 
 }
 
-- 
1.7.4.2

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman