From owner-svn-src-stable@FreeBSD.ORG  Thu Mar 28 09:03:16 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3B10882F;
 Thu, 28 Mar 2013 09:03:16 +0000 (UTC)
 (envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2D3D4892;
 Thu, 28 Mar 2013 09:03:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2S93Fd4073699;
 Thu, 28 Mar 2013 09:03:15 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2S93FEO073698;
 Thu, 28 Mar 2013 09:03:15 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201303280903.r2S93FEO073698@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Thu, 28 Mar 2013 09:03:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r248821 - stable/8/lib/libc/stdlib
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Mar 2013 09:03:16 -0000

Author: gavin
Date: Thu Mar 28 09:03:15 2013
New Revision: 248821
URL: http://svnweb.freebsd.org/changeset/base/248821

Log:
  When r241373 was merged, one file appears to have been missed from the
  commit.  Merge it:
          Remove undefined behavior from sranddev() and
          srandomdev(). This doesn't actually work
          with any modern C compiler:
  
          In particular, both clang and modern gcc
          verisons silently elide any xor operation
          with 'junk'.
  
  No mergeinfo changes with this commit as r241475 already updated the
  mergeinfo.

Modified:
  stable/8/lib/libc/stdlib/random.c

Modified: stable/8/lib/libc/stdlib/random.c
==============================================================================
--- stable/8/lib/libc/stdlib/random.c	Thu Mar 28 08:13:52 2013	(r248820)
+++ stable/8/lib/libc/stdlib/random.c	Thu Mar 28 09:03:15 2013	(r248821)
@@ -315,10 +315,9 @@ srandomdev()
 
 	if (!done) {
 		struct timeval tv;
-		unsigned long junk;
 
 		gettimeofday(&tv, NULL);
-		srandom((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec ^ junk);
+		srandom((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec);
 		return;
 	}