Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- WinSCard.c
- +++ WinSCard.c
- @@ -600,7 +600,7 @@
- if (*pcchReaderLen == SCARD_AUTOALLOCATE) {
- mem1 = mymalloc(sizeof(*dst) * (kReaderLen + 1));
- if (!mem1) {
- - goto nomem;
- + return SCARD_E_NO_MEMORY;
- }
- dst = *(LPSTR *)szkReaderName = mem1;
- }
- @@ -622,7 +622,8 @@
- if (*pcbAtrLen == SCARD_AUTOALLOCATE) {
- mem2 = mymalloc(sizeof(kATR));
- if (!mem2) {
- - goto nomem;
- + myfree(mem1);
- + return SCARD_E_NO_MEMORY;
- }
- dst = *(LPBYTE *)pbAtr = mem2;
- }
- @@ -630,11 +631,6 @@
- *pcbAtrLen = sizeof(kATR);
- }
- return SCARD_S_SUCCESS;
- -
- -nomem:
- - myfree(mem1);
- - myfree(mem2);
- - return SCARD_E_NO_MEMORY;
- }
- LONG WINAPI SCardStatusW(
- @@ -657,7 +653,7 @@
- if (*pcchReaderLen == SCARD_AUTOALLOCATE) {
- mem1 = mymalloc(sizeof(*dst) * (kReaderLen + 1));
- if (!mem1) {
- - goto nomem;
- + return SCARD_E_NO_MEMORY;
- }
- dst = *(LPWSTR *)szkReaderName = mem1;
- }
- @@ -679,7 +675,8 @@
- if (*pcbAtrLen == SCARD_AUTOALLOCATE) {
- mem2 = mymalloc(sizeof(kATR));
- if (!mem2) {
- - goto nomem;
- + myfree(mem1);
- + return SCARD_E_NO_MEMORY;
- }
- dst = *(LPBYTE *)pbAtr = mem2;
- }
- @@ -687,11 +684,6 @@
- *pcbAtrLen = sizeof(kATR);
- }
- return SCARD_S_SUCCESS;
- -
- -nomem:
- - myfree(mem1);
- - myfree(mem2);
- - return SCARD_E_NO_MEMORY;
- }
- /*---------------------------------------------------------------------------*/
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
