channels/smartcard: fix some valgrind warnings

diff --git a/channels/smartcard/client/smartcard_operations.c b/channels/smartcard/client/smartcard_operations.c
index 310963c..46d01d6 100644 (file)
--- a/channels/smartcard/client/smartcard_operations.c
+++ b/channels/smartcard/client/smartcard_operations.c
@@ -152,7 +152,7 @@ size_t smartcard_multi_string_length_a(const char* msz)
        if (!p)
                return 0;
 
-       while (p[0] || p[1])
+       while ((p[0] != 0) && (p[1] != 0))
                p++;
 
        return (p - msz);
@@ -165,7 +165,7 @@ size_t smartcard_multi_string_length_w(const WCHAR* msz)
        if (!p)
                return 0;
 
-       while (p[0] || p[1])
+       while ((p[0] != 0) && (p[1] != 0))
                p++;
 
        return (p - msz);

diff --git a/libfreerdp/core/mcs.c b/libfreerdp/core/mcs.c
index efffff5..31620b8 100644 (file)
--- a/libfreerdp/core/mcs.c
+++ b/libfreerdp/core/mcs.c
@@ -1087,6 +1087,7 @@ void mcs_free(rdpMcs* mcs)
 {
        if (mcs)
        {
+               free(mcs->channels);
                free(mcs);
        }
 }

diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c
index cc80a31..e42dc18 100644 (file)
--- a/winpr/libwinpr/smartcard/smartcard_pcsc.c
+++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c
@@ -64,7 +64,7 @@ size_t PCSC_MultiStringLengthA(const char* msz)
        if (!p)
                return 0;
 
-       while (p[0] || p[1])
+       while ((p[0] != 0) && (p[1] != 0))
                p++;
 
        return (p - msz);
@@ -77,7 +77,7 @@ size_t PCSC_MultiStringLengthW(const WCHAR* msz)
        if (!p)
                return 0;
 
-       while (p[0] || p[1])
+       while ((p[0] != 0) && (p[1] != 0))
                p++;
 
        return (p - msz);