From 8580489cbde00d85d5d3f95ab00cfb02af269907 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Fri, 11 Dec 2020 23:36:54 +0100
Subject: [PATCH] le_streamer_client, le_data_channel_client: fix adv name
 matching

---
 example/le_data_channel_client.c | 9 +++------
 example/le_streamer_client.c     | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/example/le_data_channel_client.c b/example/le_data_channel_client.c
index 9c3c26999..fbc3eaed8 100644
--- a/example/le_data_channel_client.c
+++ b/example/le_data_channel_client.c
@@ -140,15 +140,12 @@ static int advertisement_report_contains_name(const char * name, uint8_t * adver
         uint8_t data_type    = ad_iterator_get_data_type(&context);
         uint8_t data_size    = ad_iterator_get_data_len(&context);
         const uint8_t * data = ad_iterator_get_data(&context);
-        int i;
         switch (data_type){
             case BLUETOOTH_DATA_TYPE_SHORTENED_LOCAL_NAME:
             case BLUETOOTH_DATA_TYPE_COMPLETE_LOCAL_NAME:
-                // compare common prefix
-                for (i=0; i<data_size && i<name_len;i++){
-                    if (data[i] != name[i]) break;
-                }
-                // prefix match
+                // compare prefix
+                if (data_size < name_len) break;
+                if (memcmp(data, name, name_len) == 0) return 1;
                 return 1;
             default:
                 break;
diff --git a/example/le_streamer_client.c b/example/le_streamer_client.c
index 900b4aa51..025b72f19 100644
--- a/example/le_streamer_client.c
+++ b/example/le_streamer_client.c
@@ -185,15 +185,12 @@ static int advertisement_report_contains_name(const char * name, uint8_t * adver
         uint8_t data_type    = ad_iterator_get_data_type(&context);
         uint8_t data_size    = ad_iterator_get_data_len(&context);
         const uint8_t * data = ad_iterator_get_data(&context);
-        int i;
         switch (data_type){
             case BLUETOOTH_DATA_TYPE_SHORTENED_LOCAL_NAME:
             case BLUETOOTH_DATA_TYPE_COMPLETE_LOCAL_NAME:
-                // compare common prefix
-                for (i=0; i<data_size && i<name_len;i++){
-                    if (data[i] != name[i]) break;
-                }
-                // prefix match
+                // compare prefix
+                if (data_size < name_len) break;
+                if (memcmp(data, name, name_len) == 0) return 1;
                 return 1;
             default:
                 break;