[X9D] Buffer overflow in BMP code

[X9D] External clock for RTC
This commit is contained in:
bernet.andre@gmail.com
2013-01-10 09:55:14 +00:00
parent 20900734b8
commit d82e8a9359
4 changed files with 7 additions and 4 deletions
+1 -1
View File
@@ -116,7 +116,7 @@ const pm_char * bmpLoad(uint8_t *dest, const char *filename)
return STR_INCOMPATIBLE; return STR_INCOMPATIBLE;
} }
if (width > 64 || height > 32) { if (width > MODEL_BITMAP_WIDTH || height > MODEL_BITMAP_HEIGHT) {
f_close(&bmpFile); f_close(&bmpFile);
return STR_INCOMPATIBLE; return STR_INCOMPATIBLE;
} }
+1 -1
View File
@@ -94,7 +94,7 @@ EEGeneral g_eeGeneral;
ModelData g_model; ModelData g_model;
#if defined(PCBX9D) && defined(SDCARD) #if defined(PCBX9D) && defined(SDCARD)
uint8_t modelBitmap[64*32/8]; uint8_t modelBitmap[MODEL_BITMAP_SIZE];
void loadModelBitmap() void loadModelBitmap()
{ {
char lfn[] = BITMAPS_PATH "/xxxxxxxxxx.bmp"; char lfn[] = BITMAPS_PATH "/xxxxxxxxxx.bmp";
+4 -1
View File
@@ -229,7 +229,10 @@ extern char modelNames[MAX_MODELS][sizeof(g_model.name)];
#endif #endif
#if defined(PCBX9D) #if defined(PCBX9D)
extern uint8_t modelBitmap[64*32/8]; #define MODEL_BITMAP_WIDTH 64
#define MODEL_BITMAP_HEIGHT 32
#define MODEL_BITMAP_SIZE (2+MODEL_BITMAP_WIDTH*MODEL_BITMAP_HEIGHT/8)
extern uint8_t modelBitmap[MODEL_BITMAP_SIZE];
void loadModelBitmap(); void loadModelBitmap();
#define LOAD_MODEL_BITMAP() loadModelBitmap() #define LOAD_MODEL_BITMAP() loadModelBitmap()
#else #else
+1 -1
View File
@@ -72,7 +72,7 @@ void rtc_init()
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE); RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
PWR_BackupAccessCmd(ENABLE); PWR_BackupAccessCmd(ENABLE);
RCC_RTCCLKConfig(RCC_RTCCLKSource_LSI); RCC_RTCCLKConfig(RCC_RTCCLKSource_LSE);
RCC_RTCCLKCmd(ENABLE); RCC_RTCCLKCmd(ENABLE);
RTC_InitStruct.RTC_HourFormat = RTC_HourFormat_24; RTC_InitStruct.RTC_HourFormat = RTC_HourFormat_24;