fix: crash loop on new chip (#45)

kienvo · web-flow · commit 68e4ce488d0a · 2024-09-05T17:30:40.000+02:00
changes: skip reading bitmaps on invalid magic header
diff --git a/src/data.c b/src/data.c
@@ -43,6 +43,9 @@ uint16_t data_flash2newmem(uint8_t **chunk, uint32_t n)
 {
 	data_legacy_t *header = data_get_header(0);
 
+	if (memcmp(header->header, "wang", 5))
+		return 0;
+
 	uint16_t size = bswap16(header->sizes[n]) * LED_ROWS;
 	if (size == 0)
 		return 0;
diff --git a/src/main.c b/src/main.c
@@ -79,6 +79,9 @@ void play_splash(xbm_t *xbm, int col, int row)
 
 void load_bmlist()
 {
+	if (data_get_header(0) == 0) // There is no bitmap stored in flash
+		return; // skip
+
 	bm_t *curr_bm = bmlist_current();
 
 	for (int i=0; i<8; i++) {

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,9 @@ uint16_t data_flash2newmem(uint8_t **chunk, uint32_t n)`
`43`	`43`	`{`
`44`	`44`	`data_legacy_t *header = data_get_header(0);`
`45`	`45`
	`46`	`+ if (memcmp(header->header, "wang", 5))`
	`47`	`+ return 0;`
	`48`	`+`
`46`	`49`	`uint16_t size = bswap16(header->sizes[n]) * LED_ROWS;`
`47`	`50`	`if (size == 0)`
`48`	`51`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@ void play_splash(xbm_t *xbm, int col, int row)`
`79`	`79`
`80`	`80`	`void load_bmlist()`
`81`	`81`	`{`
	`82`	`+ if (data_get_header(0) == 0) // There is no bitmap stored in flash`
	`83`	`+ return; // skip`
	`84`	`+`
`82`	`85`	`bm_t *curr_bm = bmlist_current();`
`83`	`86`
`84`	`87`	`for (int i=0; i<8; i++) {`