diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-08 14:13:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-12 00:00:57 +0100 |
| commit | 7ad4bf48995957c8fa744d389d28e49116d7e133 (patch) | |
| tree | d74c20e0253a3c0ba4580784b51bb31aa0c7ebaf | |
| parent | 43ada90fc5d9bcd1da44493e31b5cb86f3fe1ff1 (diff) | |
| download | ffmpeg-7ad4bf48995957c8fa744d389d28e49116d7e133.tar.gz | |
avutil/softfloat: Fix overflows in shifts in av_cmp_sf() and av_gt_sf()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cee3c9d29aceec8cddd829acd6dfb56dc5f60322)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavutil/softfloat.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index e5bfbbdfc6..ae11bdb39d 100644 --- a/libavutil/softfloat.h +++ b/libavutil/softfloat.h @@ -119,15 +119,19 @@ static inline av_const SoftFloat av_div_sf(SoftFloat a, SoftFloat b){ static inline av_const int av_cmp_sf(SoftFloat a, SoftFloat b){ int t= a.exp - b.exp; - if(t<0) return (a.mant >> (-t)) - b.mant ; - else return a.mant - (b.mant >> t); + if (t <-31) return - b.mant ; + else if (t < 0) return (a.mant >> (-t)) - b.mant ; + else if (t < 32) return a.mant - (b.mant >> t); + else return a.mant ; } static inline av_const int av_gt_sf(SoftFloat a, SoftFloat b) { int t= a.exp - b.exp; - if(t<0) return (a.mant >> (-t)) > b.mant ; - else return a.mant > (b.mant >> t); + if (t <-31) return 0; + else if (t < 0) return (a.mant >> (-t)) > b.mant ; + else if (t < 32) return a.mant > (b.mant >> t); + else return 1; } static inline av_const SoftFloat av_add_sf(SoftFloat a, SoftFloat b){ |