mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5360 segfault using smartcard without any readers (#5361)

Browse Source 
* Fix: corrected test for astyle.

* Fix: added test for NULL readers returned by ConvertFromUnicode.
This commit is contained in:
Pascal J. Bourguignon 2019-04-26 09:10:41 +02:00 committed by akallabeth
parent e1ef302a8d
commit 431c37f3a9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
channels/smartcard/client/smartcard_operations.c
View File

@ -493,7 +493,7 @@ static DWORD filter_device_by_name_w(wLinkedList* list, LPWSTR* mszReaders, DWOR
{
int res;
DWORD rc;
LPSTR readers;
LPSTR readers = NULL;
if (LinkedList_Count(list) < 1)
return cchReaders;
@ -501,13 +501,13 @@ static DWORD filter_device_by_name_w(wLinkedList* list, LPWSTR* mszReaders, DWOR
res = ConvertFromUnicode(CP_UTF8, 0, *mszReaders, (int)cchReaders, &readers, 0, NULL,
NULL);
if ((res < 0) || ((DWORD)res != cchReaders))
/* When res==0, readers may have been set to NULL by ConvertFromUnicode */
if ((res < 0) || ((DWORD)res != cchReaders) || (readers == 0))
return 0;
free(*mszReaders);
*mszReaders = NULL;
rc = filter_device_by_name_a(list, &readers, cchReaders);
res = ConvertToUnicode(CP_UTF8, 0, readers, (int)rc, mszReaders, 0);
if ((res < 0) || ((DWORD)res != rc))

2
scripts/format_code.sh
View File

@ -2,7 +2,7 @@
ASTYLE=$(which astyle)
if [ ! -x $ASTYLE ]; then
if [ ! -x "$ASTYLE" ]; then
echo "No astyle found in path, please install."
exit 1
fi