Skip to content

Fix buffer size mismatch (#114) #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
P-rth wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix buffer size mismatch (#114) #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96bd8eb
Fix buffer size mismatch (#114)
P-rth Feb 24, 2026
fc98ecc
Issues fixed
P-rth Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "util/crc.h"

#include "ISP583.h"
#include "CH58xBLE_LIB.h"
#include <stdlib.h>

#define CFG_SIZE sizeof(badge_cfg_t)
Expand All @@ -20,17 +21,20 @@ badge_cfg_t badge_cfg;
void cfg_fallback()
{
badge_cfg.ble_always_on = 0;
memcpy(badge_cfg.ble_devname, "LED Badge Magic\0\0\0\0", 20);
tmos_memcpy(badge_cfg.ble_devname, "LED Badge Magic\0\0\0\0", 20);
/* OEM app testing: */
// memcpy(badge_cfg.ble_devname, "LSLED\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20);
// tmos_memcpy(badge_cfg.ble_devname, "LSLED\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20);

badge_cfg.led_brightness = 0;
badge_cfg.led_scan_freq = 2000;

badge_cfg.splash_speedT = 30; // ms

int splash_size = ALIGN_1BYTE(splash.w) * splash.h;
memcpy(badge_cfg.splash_bm_bits, splash.bits, splash_size);
if (splash_size > (int)sizeof(badge_cfg.splash_bm_bits))
splash_size = sizeof(badge_cfg.splash_bm_bits);
tmos_memset(badge_cfg.splash_bm_bits, 0, sizeof(badge_cfg.splash_bm_bits));
tmos_memcpy(badge_cfg.splash_bm_bits, splash.bits, splash_size);
badge_cfg.splash_bm_w = splash.w;
badge_cfg.splash_bm_h = splash.h;
badge_cfg.splash_bm_fh = splash.fh;
Expand Down
4 changes: 4 additions & 0 deletions src/ngctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ uint8_t power_setting(uint8_t *val, uint16_t len)

static void cfg_ble_devname(uint8_t *name, uint16_t len)
{
if (len > sizeof(badge_cfg.ble_devname))
len = sizeof(badge_cfg.ble_devname);
tmos_memset(badge_cfg.ble_devname, 0, sizeof(badge_cfg.ble_devname));
tmos_memcpy(badge_cfg.ble_devname, name, len);
}

Expand Down Expand Up @@ -106,6 +109,7 @@ uint8_t flash_splash_screen(uint8_t *val, uint16_t len)
if (len < 3)
return -4;

tmos_memset(badge_cfg.splash_bm_bits, 0, sizeof(badge_cfg.splash_bm_bits));
tmos_memcpy(badge_cfg.splash_bm_bits, &val[3], sz);
badge_cfg.splash_bm_w = w;
badge_cfg.splash_bm_h = h;
Expand Down