rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-15 04:59:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to FreeBSD head 2016-08-23

Browse Source 
Git mirror commit 9fe7c416e6abb28b1398fd3e5687099846800cfd.
This commit is contained in:
Sebastian Huber
2016-10-07 15:10:20 +02:00
parent 8c0eebac7d
commit c40e45b75e
1040 changed files with 156866 additions and 67039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
freebsd/lib/libc/net/base64.c
View File

@@ -45,7 +45,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <rtems/bsd/sys/param.h>
#include <sys/socket.h>
@@ -195,12 +194,10 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) {
*/
int
b64_pton(src, target, targsize)
char const *src;
u_char *target;
size_t targsize;
b64_pton(const char *src, u_char *target, size_t targsize)
{
int tarindex, state, ch;
u_char nextbyte;
char *pos;
state = 0;
@@ -214,7 +211,7 @@ b64_pton(src, target, targsize)
break;
pos = strchr(Base64, ch);
if (pos == 0) /* A non-base64 character. */
if (pos == NULL) /* A non-base64 character. */
return (-1);
switch (state) {
@@ -228,22 +225,28 @@ b64_pton(src, target, targsize)
break;
case 1:
if (target) {
if ((size_t)tarindex + 1 >= targsize)
if ((size_t)tarindex >= targsize)
return (-1);
target[tarindex] |= (pos - Base64) >> 4;
target[tarindex+1] = ((pos - Base64) & 0x0f)
<< 4 ;
nextbyte = ((pos - Base64) & 0x0f) << 4;
if ((size_t)tarindex + 1 < targsize)
target[tarindex + 1] = nextbyte;
else if (nextbyte)
return (-1);
}
tarindex++;
state = 2;
break;
case 2:
if (target) {
if ((size_t)tarindex + 1 >= targsize)
if ((size_t)tarindex >= targsize)
return (-1);
target[tarindex] |= (pos - Base64) >> 2;
target[tarindex+1] = ((pos - Base64) & 0x03)
<< 6;
nextbyte = ((pos - Base64) & 0x03) << 6;
if ((size_t)tarindex + 1 < targsize)
target[tarindex + 1] = nextbyte;
else if (nextbyte)
return (-1);
}
tarindex++;
state = 3;
@@ -301,7 +304,8 @@ b64_pton(src, target, targsize)
* zeros. If we don't check them, they become a
* subliminal channel.
*/
if (target && target[tarindex] != 0)
if (target && (size_t)tarindex < targsize &&
target[tarindex] != 0)
return (-1);
}
} else {