generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 2e819c58: am 2ff3c746: Merge "Check memory size on FD_* functions"

Browse Source 
* commit '2e819c58c9396eec3e4311ef2c9bdcadd107f001':
  Check memory size on FD_* functions
This commit is contained in:
Nick Kralevich
2013-10-03 15:57:09 -07:00
committed by Android Git Automerger
parent 1a086a52d3 2e819c58c9
commit 6f10368926
3 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libc/include/sys/select.h
View File

@@ -32,6 +32,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include <signal.h>
#include <string.h>
__BEGIN_DECLS
@@ -46,21 +47,19 @@ typedef struct {
#define __FDELT(fd) ((fd) / __NFDBITS)
#define __FDMASK(fd) (1UL << ((fd) % __NFDBITS))
#define __FDS_BITS(set) (((fd_set*)(set))->fds_bits)
#define __FD_ZERO(set) (memset(set, 0, sizeof(*(fd_set*)(set))))
#if defined(__BIONIC_FORTIFY)
extern void __FD_CLR_chk(int, fd_set*, size_t);
extern void __FD_SET_chk(int, fd_set*, size_t);
extern int __FD_ISSET_chk(int, fd_set*, size_t);
#define __FD_CLR(fd, set) __FD_CLR_chk(fd, set, __bos(set))
#define __FD_SET(fd, set) __FD_SET_chk(fd, set, __bos(set))
#define __FD_ISSET(fd, set) __FD_ISSET_chk(fd, set, __bos(set))
#else
#define __FD_CLR(fd, set) (__FDS_BITS(set)[__FDELT(fd)] &= ~__FDMASK(fd))
#define __FD_SET(fd, set) (__FDS_BITS(set)[__FDELT(fd)] |= __FDMASK(fd))
#define __FD_ISSET(fd, set) ((__FDS_BITS(set)[__FDELT(fd)] & __FDMASK(fd)) != 0)
#define __FD_ZERO(set) (__builtin_memset(set, 0, sizeof(*(fd_set*)(set))))
#if defined(__BIONIC_FORTIFY)
extern void __FD_CLR_chk(int, fd_set*);
extern void __FD_SET_chk(int, fd_set*);
extern int __FD_ISSET_chk(int, fd_set*);
#undef __FD_CLR
#undef __FD_SET
#undef __FD_ISSET
#define __FD_CLR(fd, set) __FD_CLR_chk(fd, set)
#define __FD_SET(fd, set) __FD_SET_chk(fd, set)
#define __FD_ISSET(fd, set) __FD_ISSET_chk(fd, set)
#endif /* defined(__BIONIC_FORTIFY) */
extern int select(int, fd_set*, fd_set*, fd_set*, struct timeval*);