Always copy null terminator when filtering smartcard list

diff --git a/channels/smartcard/client/smartcard_operations.c b/channels/smartcard/client/smartcard_operations.c
index 13035fd..e99d27b 100644 (file)
--- a/channels/smartcard/client/smartcard_operations.c
+++ b/channels/smartcard/client/smartcard_operations.c
@@ -456,12 +456,16 @@ static DWORD filter_device_by_name_a(wLinkedList* list, LPSTR* mszReaders, DWORD
                LPCSTR rreader = &(*mszReaders)[rpos];
                LPSTR wreader = &(*mszReaders)[wpos];
                size_t readerLen = strnlen(rreader, cchReaders - rpos);
+
+               if (readerLen == 0)
+                       break;
+
                rpos += readerLen + 1;
 
                if (filter_match(list, rreader, readerLen))
                {
                        if (rreader != wreader)
-                               memmove(wreader, rreader, readerLen);
+                               memmove(wreader, rreader, readerLen + 1);
 
                        wpos += readerLen + 1;
                }