From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 6 Jun 2012 18:31:06 +0000 (+0200)
Subject: re PR libgomp/52993 (gomp_init_nest_lock_25: possible bad call to memset)
X-Git-Tag: misc/gccgo-go1_1_2~2510
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43fa5db598b9d38420d0d66d14268aae14b0de75;p=thirdparty%2Fgcc.git

re PR libgomp/52993 (gomp_init_nest_lock_25: possible bad call to memset)

	PR libgomp/52993
	* config/linux/lock.c (gomp_init_nest_lock_25): Fix up last
	argument to memset call.

From-SVN: r188276
---

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index f8d57398bc66..f22c41a728f7 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-06  Jakub Jelinek  <jakub@redhat.com>
+
+	PR libgomp/52993
+	* config/linux/lock.c (gomp_init_nest_lock_25): Fix up last
+	argument to memset call.
+
 2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* configure: Regenerated.
diff --git a/libgomp/config/linux/lock.c b/libgomp/config/linux/lock.c
index 60693439422f..047d8cdf782c 100644
--- a/libgomp/config/linux/lock.c
+++ b/libgomp/config/linux/lock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2008, 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU OpenMP Library (libgomp).
@@ -175,7 +175,7 @@ static inline int gomp_tid (void)
 void
 gomp_init_nest_lock_25 (omp_nest_lock_25_t *lock)
 {
-  memset (lock, 0, sizeof (lock));
+  memset (lock, 0, sizeof (*lock));
 }
 
 void