From owner-svn-src-all@FreeBSD.ORG  Mon Mar 23 20:02:17 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 29587436;
 Mon, 23 Mar 2015 20:02:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 14065672;
 Mon, 23 Mar 2015 20:02:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2NK2G1c072735;
 Mon, 23 Mar 2015 20:02:16 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2NK2Gi6072734;
 Mon, 23 Mar 2015 20:02:16 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201503232002.t2NK2Gi6072734@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 23 Mar 2015 20:02:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r280397 - stable/9/lib/msun/src
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Mar 2015 20:02:17 -0000

Author: pfg
Date: Mon Mar 23 20:02:16 2015
New Revision: 280397
URL: https://svnweb.freebsd.org/changeset/base/280397

Log:
  MFC	r277948:
  msun: use previously ignored "in" value.
  
  This fixes evaluation of exceptional values in scalblnl().
  While here, simplify the code as suggested by Bruce Evans.
  
  Reported by:	clang static analyzer

Modified:
  stable/9/lib/msun/src/s_scalbln.c
Directory Properties:
  stable/9/lib/msun/   (props changed)

Modified: stable/9/lib/msun/src/s_scalbln.c
==============================================================================
--- stable/9/lib/msun/src/s_scalbln.c	Mon Mar 23 20:00:35 2015	(r280396)
+++ stable/9/lib/msun/src/s_scalbln.c	Mon Mar 23 20:02:16 2015	(r280397)
@@ -35,13 +35,7 @@ scalbln (double x, long n)
 {
 	int in;
 
-	in = (int)n;
-	if (in != n) {
-		if (n > 0)
-			in = INT_MAX;
-		else
-			in = INT_MIN;
-	}
+	in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n;
 	return (scalbn(x, in));
 }
 
@@ -50,13 +44,7 @@ scalblnf (float x, long n)
 {
 	int in;
 
-	in = (int)n;
-	if (in != n) {
-		if (n > 0)
-			in = INT_MAX;
-		else
-			in = INT_MIN;
-	}
+	in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n;
 	return (scalbnf(x, in));
 }
 
@@ -65,12 +53,6 @@ scalblnl (long double x, long n)
 {
 	int in;
 
-	in = (int)n;
-	if (in != n) {
-		if (n > 0)
-			in = INT_MAX;
-		else
-			in = INT_MIN;
-	}
-	return (scalbnl(x, (int)n));
+	in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; 
+	return (scalbnl(x, in));
 }