From: Marc-André Moreau <marcandre.moreau@gmail.com>
Date: Tue, 8 Apr 2014 15:34:46 +0000 (-0400)
Subject: Merge branch 'smartcard' of github.com:awakecoding/FreeRDP into smartcard
X-Git-Tag: 1.2.0-beta1+android7~74^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca1ec811e825341bc5c814426084cf385d99e9b6;p=platform%2Fupstream%2Ffreerdp.git

Merge branch 'smartcard' of github.com:awakecoding/FreeRDP into smartcard

Conflicts:
	channels/smartcard/client/smartcard_pack.c
---

ca1ec811e825341bc5c814426084cf385d99e9b6
diff --cc channels/smartcard/client/smartcard_pack.c
index 4a59895,11c5dd5..557c262
--- a/channels/smartcard/client/smartcard_pack.c
+++ b/channels/smartcard/client/smartcard_pack.c
@@@ -498,8 -470,13 +498,13 @@@ UINT32 smartcard_pack_list_readers_retu
  	Stream_Write_UINT32(s, ret->cBytes); /* cBytes (4 bytes) */
  	Stream_Write_UINT32(s, 0x00020008); /* mszNdrPtr (4 bytes) */
  	Stream_Write_UINT32(s, ret->cBytes); /* mszNdrLen (4 bytes) */
- 	Stream_Write(s, ret->msz, ret->cBytes);
+ 	
+ 	if (ret->msz)
+ 		Stream_Write(s, ret->msz, ret->cBytes);
+ 	else
+ 		Stream_Zero(s, ret->cBytes);
+ 	
 -	smartcard_pack_write_offset_align(smartcard, s, 4);
 +	smartcard_pack_write_size_align(smartcard, s, ret->cBytes, 4);
  
  	return SCARD_S_SUCCESS;
  }
@@@ -1009,8 -978,13 +1014,13 @@@ UINT32 smartcard_pack_status_return(SMA
  	Stream_Write_UINT32(s, ret->cbAtrLen); /* cbAtrLen (4 bytes) */
  
  	Stream_Write_UINT32(s, ret->cBytes); /* mszReaderNamesNdrLen (4 bytes) */
- 	Stream_Write(s, ret->mszReaderNames, ret->cBytes);
+ 	
+ 	if (ret->mszReaderNames)
+ 		Stream_Write(s, ret->mszReaderNames, ret->cBytes);
+ 	else
+ 		Stream_Zero(s, ret->cBytes);
+ 	
 -	smartcard_pack_write_offset_align(smartcard, s, 4);
 +	smartcard_pack_write_size_align(smartcard, s, ret->cBytes, 4);
  
  	return SCARD_S_SUCCESS;
  }