From: paolo Date: Mon, 23 Jun 2014 19:03:07 +0000 (+0000) Subject: 2014-06-23 Paolo Carlini X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7f894a84d60319b5939ab6e34e77bd1c5f3f64f;p=thirdparty%2Fgcc.git 2014-06-23 Paolo Carlini * sanitizer_common/sanitizer_common_interceptors.inc: Cherry pick upstream r211008. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211912 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index af3b8a30f8eb..4d5b71af4b92 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,8 @@ +2014-06-23 Paolo Carlini + + * sanitizer_common/sanitizer_common_interceptors.inc: + Cherry pick upstream r211008. + 2014-06-11 Richard Biener * asan/asan_linux.cc: Cherry pick upstream r210012. @@ -24,7 +29,8 @@ * asan/Makefile.in: Regenerate. * tsan/Makefile.am (tsan_files): Added new files. * tsan/Makefile.in: Regenerate. - * sanitizer_common/Makefile.am (sanitizer_common_files): Added new files. + * sanitizer_common/Makefile.am (sanitizer_common_files): Added new + files. * sanitizer_common/Makefile.in: Regenerate. 2014-05-14 Yury Gribov diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc index f758c1a6c526..6cbe03ae34ab 100644 --- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc +++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc @@ -1796,7 +1796,7 @@ INTERCEPTOR(int, getsockopt, int sockfd, int level, int optname, void *optval, INTERCEPTOR(int, accept, int fd, void *addr, unsigned *addrlen) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, accept, fd, addr, addrlen); - unsigned addrlen0; + unsigned addrlen0 = 0; if (addrlen) { COMMON_INTERCEPTOR_READ_RANGE(ctx, addrlen, sizeof(*addrlen)); addrlen0 = *addrlen; @@ -1818,7 +1818,7 @@ INTERCEPTOR(int, accept, int fd, void *addr, unsigned *addrlen) { INTERCEPTOR(int, accept4, int fd, void *addr, unsigned *addrlen, int f) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, accept4, fd, addr, addrlen, f); - unsigned addrlen0; + unsigned addrlen0 = 0; if (addrlen) { COMMON_INTERCEPTOR_READ_RANGE(ctx, addrlen, sizeof(*addrlen)); addrlen0 = *addrlen;