Update draw method to prevent buffer overflow.

- Adjusted buffer size calculation in the draw method of BaseWidgetValue and WidgetBool classes to avoid potential buffer overflow issues.
forntoh · Oct 21, 2024 · 9acf555 · 9acf555
1 parent d9ace60
commit 9acf555
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/widget/BaseWidgetValue.h b/src/widget/BaseWidgetValue.h
@@ -47,7 +47,7 @@ class BaseWidgetValue : public BaseWidget {
      */
     uint8_t draw(char* buffer, const uint8_t start) override {
         if (start >= ITEM_DRAW_BUFFER_SIZE) return 0;
-        return snprintf(buffer + start, ITEM_DRAW_BUFFER_SIZE, format, value);
+        return snprintf(buffer + start, ITEM_DRAW_BUFFER_SIZE - start, format, value);
     }
 
     bool process(LcdMenu* menu, unsigned char command) override = 0;

diff --git a/src/widget/WidgetBool.h b/src/widget/WidgetBool.h
@@ -31,7 +31,7 @@ class WidgetBool : public BaseWidgetValue<bool> {
   protected:
     uint8_t draw(char* buffer, const uint8_t start) override {
         if (start >= ITEM_DRAW_BUFFER_SIZE) return 0;
-        return snprintf(buffer + start, ITEM_DRAW_BUFFER_SIZE, format, value ? textOn : textOff);
+        return snprintf(buffer + start, ITEM_DRAW_BUFFER_SIZE - start, format, value ? textOn : textOff);
     }
     /**
      * @brief Process command.