pidgin/pidgin

Fix an issue where color_is_visible was incorrectly comparing unsigned values that were potentially wrapping.
release-2.x.y
2021-02-11, Gary Kramlich
033c9e85ca14
Parents cf9821fc48e7
Children 116464ec6245
Fix an issue where color_is_visible was incorrectly comparing unsigned values that were potentially wrapping.

Testing Done:
Compile only.

Reviewed at https://reviews.imfreedom.org/r/493/
1 files changed, 5 insertions(+), 4 deletions(-)
  • +5 -4
    pidgin/gtkconv.c
    • --- a/pidgin/gtkconv.c Thu Feb 11 23:54:58 2021 -0600
    +++ b/pidgin/gtkconv.c Thu Feb 11 23:55:55 2021 -0600
    @@ -10239,16 +10239,17 @@
    fgreen = foreground.green >> 8 ;
    fblue = foreground.blue >> 8 ;
    -
    bred = background.red >> 8 ;
    bgreen = background.green >> 8 ;
    bblue = background.blue >> 8 ;
    fg_brightness = (fred * 299 + fgreen * 587 + fblue * 114) / 1000;
    bg_brightness = (bred * 299 + bgreen * 587 + bblue * 114) / 1000;
    - br_diff = abs(fg_brightness - bg_brightness);
    -
    - col_diff = abs(fred - bred) + abs(fgreen - bgreen) + abs(fblue - bblue);
    + br_diff = MAX(fg_brightness, bg_brightness) - MIN(fg_brightness, bg_brightness);
    +
    + col_diff = (MAX(fred, bred) - MIN(fred, bred)) +
    + (MAX(fgreen, bgreen) - MIN(fgreen, bgreen)) +
    + (MAX(fblue, bblue) - MIN(fblue, bblue));
    return ((col_diff > color_contrast) && (br_diff > brightness_contrast));
    }