From: Dodji Seketeli <dodji@redhat.com>
Date: Thu, 14 Feb 2013 04:37:56 +0000 (+0000)
Subject: [asan] Fix a thinko leading to a crash
X-Git-Tag: upstream/12.2.0~71243
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8fb067263b60e184b2e0d303e1b8d40166e2bec4;p=platform%2Fupstream%2Fgcc.git

[asan] Fix a thinko leading to a crash

It appeared that in my previous patch, a stupid thinko can lead to a
crash when instrumenting some builtin functionsK.  Fixed thus.

Bootstrapped and tested against trunk on x86_64-unknown-linux-gnu.

gcc/
	* asan.c (instrument_builtin_call):  Really put the length of the
	second source argument into src1_len.

gcc/testsuite/

	* c-c++-common/asan/memcmp-2.c: New test.

From-SVN: r196044
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4dd2753..25e4f0f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-14  Dodji Seketeli  <dodji@redhat.com>
+
+	Fix an asan crash
+	* asan.c (instrument_builtin_call):  Really put the length of the
+	second source argument into src1_len.
+
 2013-02-13  Jakub Jelinek  <jakub@redhat.com>
 
 	* asan.c (create_cond_insert_point): Add create_then_fallthru_edge
diff --git a/gcc/asan.c b/gcc/asan.c
index 9e22c42..a569479 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -1771,7 +1771,7 @@ instrument_builtin_call (gimple_stmt_iterator *iter)
 
       if (get_mem_refs_of_builtin_call (call,
 					&src0, &src0_len, &src0_is_store,
-					&src1, &src0_len, &src1_is_store,
+					&src1, &src1_len, &src1_is_store,
 					&dest, &dest_len, &dest_is_store,
 					&dest_is_deref))
 	{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e4f70ce..e3ae57d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-14  Dodji Seketeli  <dodji@redhat.com>
+
+	Fix an asan crash
+	* c-c++-common/asan/memcmp-2.c: New test.
+
 2013-02-13  Ed Smith-Rowland  <3dw4rd@verizon.net>
 
 	PR c++/55582
diff --git a/gcc/testsuite/c-c++-common/asan/memcmp-2.c b/gcc/testsuite/c-c++-common/asan/memcmp-2.c
new file mode 100644
index 0000000..be20cd8
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/asan/memcmp-2.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+
+int
+foo ()
+{
+  char s0[5] = {0};
+  char s1[5] = {1};
+
+  return __builtin_memcmp (s0, s1, 2);
+}