james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

properly dereference pointer before assigning

Browse Source
This commit is contained in:
Klas Lindfors
2014-02-10 09:51:56 +01:00
parent 2b1b70caa0
commit 0c178cce0e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yubico-piv-tool.c
+4 -3
View File
@@ -1184,11 +1184,12 @@ static int transfer_data(SCARDHANDLE *card, APDU *apdu_tmpl, unsigned char *in_d
return sw; return sw;
} }
if(*out_len + recv_len - 2 > max_out) { if(*out_len + recv_len - 2 > max_out) {
fprintf(stderr, "Output buffer to small, wanted to write %lu, max was %lu.", *out_len + recv_len - 2, max_out); fprintf(stderr, "Output buffer to small, wanted to write %lu, max was %lu.\n", *out_len + recv_len - 2, max_out);
return 0;
} }
memcpy(out_data, data, recv_len - 2); memcpy(out_data, data, recv_len - 2);
out_data += recv_len - 2; out_data += recv_len - 2;
out_len += recv_len - 2; *out_len += recv_len - 2;
in_ptr += this_size; in_ptr += this_size;
} }
while(sw >> 8 == 0x61) { while(sw >> 8 == 0x61) {
@@ -1211,7 +1212,7 @@ static int transfer_data(SCARDHANDLE *card, APDU *apdu_tmpl, unsigned char *in_d
} }
memcpy(out_data, data, recv_len - 2); memcpy(out_data, data, recv_len - 2);
out_data += recv_len - 2; out_data += recv_len - 2;
out_len += recv_len - 2; *out_len += recv_len - 2;
} }
return sw; return sw;
} }