X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-binder.git;a=blobdiff_plain;f=src%2Fafb-token.c;h=21eb3c0e1d2bf2a537fded475922daca23af5746;hp=f6f5eb7360724af78de0d1c61f5ce14abcbf7511;hb=2ed1d659b481c50380faed568818443d092f06ec;hpb=6422dd2e6bee2903690fe430b0e7a666179ec163

diff --git a/src/afb-token.c b/src/afb-token.c
index f6f5eb73..21eb3c0e 100644
--- a/src/afb-token.c
+++ b/src/afb-token.c
@@ -86,7 +86,7 @@ int afb_token_get(struct afb_token **token, const char *tokenstring)
 
 	/* search the token */
 	tok = tokenset.first;
-	while (tok && memcmp(tokenstring, tok->text, length))
+	while (tok && (memcmp(tokenstring, tok->text, length) || tokenstring[length]))
 		tok = tok->next;
 
 	/* search done */
@@ -96,7 +96,7 @@ int afb_token_get(struct afb_token **token, const char *tokenstring)
 		rc = 0;
 	} else {
 		/* not found, create */
-		tok = malloc(length + sizeof *tok);
+		tok = malloc(length + 1 + sizeof *tok);
 		if (!tok)
 			/* creation failed */
 			rc = -ENOMEM;
@@ -106,7 +106,7 @@ int afb_token_get(struct afb_token **token, const char *tokenstring)
 			tokenset.first = tok;
 			tok->id = tokenset.idgen;
 			tok->refcount = 1;
-			memcpy(tok->text, tokenstring, length);
+			memcpy(tok->text, tokenstring, length + 1);
 			rc = 0;
 		}
 	}
@@ -140,6 +140,7 @@ void afb_token_unref(struct afb_token *token)
 		pthread_mutex_lock(&tokenset.mutex);
 		pt = &tokenset.first;
 		while (*pt && *pt != token)
+			pt = &(*pt)->next;
 		if (*pt)
 			*pt = token->next;
 		pthread_mutex_unlock(&tokenset.mutex);