2014-06-23 Paolo Carlini <paolo.carlini@oracle.com>

	* 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 af3b8a30f8eb46232a952b4953ae1fd9840aad81..4d5b71af4b92fc7b7a0ad61db9031b3691bf4d52 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-23  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * sanitizer_common/sanitizer_common_interceptors.inc:
+       Cherry pick upstream r211008.
+
 2014-06-11  Richard Biener  <rguenther@suse.de>
 
        * 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  <y.gribov@samsung.com>

diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc
index f758c1a6c5263e14e6bf84c3135de2054822a5fc..6cbe03ae34ab5bca2460e31e884c31daee786d08 100644 (file)
--- 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;