From d8eac1d8fc1e0468052414fdc0181820503fb9c7 Mon Sep 17 00:00:00 2001 From: netpok Date: Mon, 25 Feb 2019 21:33:41 +0100 Subject: [PATCH] Replace if with min saves ~30 bytes --- sonoff/xdrv_04_light.ino | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sonoff/xdrv_04_light.ino b/sonoff/xdrv_04_light.ino index 0594a5a09..ffde36726 100644 --- a/sonoff/xdrv_04_light.ino +++ b/sonoff/xdrv_04_light.ino @@ -1252,11 +1252,7 @@ bool LightColorEntry(char *buffer, uint8_t buffer_length) entry_type = 2; // Decimal } else if (((2 * light_subtype) == buffer_length) || (buffer_length > 3)) { // Hexadecimal entry - uint8_t limit = buffer_length / 2; - if (limit > sizeof(light_entry_color)) { // Fix buffer overflow due to too many parameters - limit = sizeof(light_entry_color); - } - for (uint8_t i = 0; i < limit; i++) { + for (uint8_t i = 0; i < min((uint)(buffer_length / 2), sizeof(light_entry_color)); i++) { strlcpy(scolor, buffer + (i *2), 3); light_entry_color[i] = (uint8_t)strtol(scolor, &p, 16); }