From patchwork Tue May 31 18:40:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 98085 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 51063B6F76 for ; Wed, 1 Jun 2011 06:53:14 +1000 (EST) Received: from localhost ([::1]:54842 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRVvw-0001y1-VU for incoming@patchwork.ozlabs.org; Tue, 31 May 2011 16:53:01 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRTrg-0003xB-Hc for qemu-devel@nongnu.org; Tue, 31 May 2011 14:40:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QRTre-0003VD-92 for qemu-devel@nongnu.org; Tue, 31 May 2011 14:40:28 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:44008) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRTrd-0003UY-QP for qemu-devel@nongnu.org; Tue, 31 May 2011 14:40:26 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QRTrZ-0003Wk-EM; Tue, 31 May 2011 19:40:21 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 31 May 2011 19:40:21 +0100 Message-Id: <1306867221-13535-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: =?UTF-8?q?Juha=20Riihim=C3=A4ki?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , patches@linaro.org Subject: [Qemu-devel] [PATCH v2] audio: fix integer overflow expression X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Juha Riihimäki Fix an integer overflow that can happen for signed 32 bit types when using FLOAT_MIXENG. (Note that at the moment this is only true when using the MacOSX coreaudio audio driver.) Signed-off-by: Juha Riihimäki [Peter Maydell: Removed unnecessary casts] Signed-off-by: Peter Maydell Tested-by: Andreas Färber --- v1->v2 : as suggested by Malc, removed one unnecessary cast from each change. audio/mixeng_template.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h index a2d0ef8..a38055c 100644 --- a/audio/mixeng_template.h +++ b/audio/mixeng_template.h @@ -46,7 +46,7 @@ static mixeng_real inline glue (conv_, ET) (IN_T v) #endif #else /* !RECIPROCAL */ #ifdef SIGNED - return nv / (mixeng_real) (IN_MAX - IN_MIN); + return nv / (mixeng_real) ((mixeng_real)IN_MAX - IN_MIN); #else return (nv - HALF) / (mixeng_real) IN_MAX; #endif @@ -63,7 +63,7 @@ static IN_T inline glue (clip_, ET) (mixeng_real v) } #ifdef SIGNED - return ENDIAN_CONVERT ((IN_T) (v * (IN_MAX - IN_MIN))); + return ENDIAN_CONVERT ((IN_T) (v * ((mixeng_real)IN_MAX - IN_MIN))); #else return ENDIAN_CONVERT ((IN_T) ((v * IN_MAX) + HALF)); #endif