allowing NULL length in base64_decode
This commit is contained in:
parent
7bb6e38a99
commit
313c2930e9
@ -72,8 +72,8 @@ char *base64_decode(char *encoded_message, size_t *length)
|
||||
BIO *bio;
|
||||
BIO *b64;
|
||||
char *separator_ptr = strrchr(encoded_message, WHY2_CHAT_BASE64_LENGTH_DELIMITER); //GET THE DELIMITER POINTER
|
||||
*length = strtoull(separator_ptr + 1, NULL, 10);
|
||||
char* decoded_message = why2_malloc(*length + 1);
|
||||
size_t length_local = strtoull(separator_ptr + 1, NULL, 10);
|
||||
char* decoded_message = why2_malloc(length_local + 1);
|
||||
int decoded_length;
|
||||
|
||||
//INIT BIOs
|
||||
@ -83,7 +83,7 @@ char *base64_decode(char *encoded_message, size_t *length)
|
||||
bio = BIO_push(b64, bio);
|
||||
|
||||
//DECODE
|
||||
decoded_length = BIO_read(bio, decoded_message, *length);
|
||||
decoded_length = BIO_read(bio, decoded_message, length_local);
|
||||
|
||||
//NULL-TERM
|
||||
decoded_message[decoded_length] = '\0';
|
||||
@ -91,6 +91,9 @@ char *base64_decode(char *encoded_message, size_t *length)
|
||||
//DEALLOCATION
|
||||
BIO_free_all(bio);
|
||||
|
||||
//SET length
|
||||
if (length != NULL) *length = length_local;
|
||||
|
||||
return decoded_message;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user