From: Sean Bright Date: Tue, 30 Apr 2013 13:48:12 +0000 (+0000) Subject: Use the proper lower bound when doing saturation arithmetic. X-Git-Tag: 13.0.0-beta1~1878 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c03b95a3d70f96cac170527512ccc815a47993f1;p=thirdparty%2Fasterisk.git Use the proper lower bound when doing saturation arithmetic. 16 bit signed integers have a range of [-32768, 32768). The existing code was using the interval (-32768, 32768) instead. This patch fixes that. Review: https://reviewboard.asterisk.org/r/2479/ ........ Merged revisions 386929 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 386930 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@386931 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 9452dd5fb6..6f041f953d 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -324,8 +324,8 @@ static force_inline void ast_slinear_saturated_add(short *input, short *value) res = (int) *input + *value; if (res > 32767) *input = 32767; - else if (res < -32767) - *input = -32767; + else if (res < -32768) + *input = -32768; else *input = (short) res; } @@ -337,8 +337,8 @@ static force_inline void ast_slinear_saturated_subtract(short *input, short *val res = (int) *input - *value; if (res > 32767) *input = 32767; - else if (res < -32767) - *input = -32767; + else if (res < -32768) + *input = -32768; else *input = (short) res; } @@ -350,8 +350,8 @@ static force_inline void ast_slinear_saturated_multiply(short *input, short *val res = (int) *input * *value; if (res > 32767) *input = 32767; - else if (res < -32767) - *input = -32767; + else if (res < -32768) + *input = -32768; else *input = (short) res; }