Off by one error in buffer length (issue 7379)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@41103 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
cd817e2338
commit
ce7f125edd
|
@ -363,7 +363,7 @@ int ast_base64encode_full(char *dst, const unsigned char *src, int srclen, int m
|
||||||
byte |= *(src++);
|
byte |= *(src++);
|
||||||
bits += 8;
|
bits += 8;
|
||||||
cntin++;
|
cntin++;
|
||||||
if ((bits == 24) && (cnt + 4 < max)) {
|
if ((bits == 24) && (cnt + 4 <= max)) {
|
||||||
*dst++ = base64[(byte >> 18) & 0x3f];
|
*dst++ = base64[(byte >> 18) & 0x3f];
|
||||||
*dst++ = base64[(byte >> 12) & 0x3f];
|
*dst++ = base64[(byte >> 12) & 0x3f];
|
||||||
*dst++ = base64[(byte >> 6) & 0x3f];
|
*dst++ = base64[(byte >> 6) & 0x3f];
|
||||||
|
@ -379,7 +379,7 @@ int ast_base64encode_full(char *dst, const unsigned char *src, int srclen, int m
|
||||||
col = 0;
|
col = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (bits && (cnt + 4 < max)) {
|
if (bits && (cnt + 4 <= max)) {
|
||||||
/* Add one last character for the remaining bits,
|
/* Add one last character for the remaining bits,
|
||||||
padding the rest with 0 */
|
padding the rest with 0 */
|
||||||
byte <<= 24 - bits;
|
byte <<= 24 - bits;
|
||||||
|
|
Reference in New Issue