catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-19 23:08:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

DFU: make sure to properly initialize g_dfu pointer before using it

Browse Source
This commit is contained in:
Harald Welte
2017-03-03 01:05:22 +01:00
parent b04f4f0ee8
commit 91fc40240e
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h
View File

@@ -97,6 +97,8 @@ struct dfudata {
unsigned int total_bytes; unsigned int total_bytes;
}; };
/* RAM address for this magic value above */
extern struct dfudata _g_dfu;
extern struct dfudata *g_dfu; extern struct dfudata *g_dfu;
void set_usb_serial_str(const uint8_t *serial_usbstr); void set_usb_serial_str(const uint8_t *serial_usbstr);

3
firmware/libboard/common/source/board_cstartup_gnu.c
View File

@@ -154,6 +154,9 @@ void ResetException( void )
#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu) #if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
/* we are before the text segment has been relocated, so g_dfu is
* not initialized yet */
g_dfu = &_g_dfu;
if (g_dfu->magic != USB_DFU_MAGIC) { if (g_dfu->magic != USB_DFU_MAGIC) {
BootIntoApp(); BootIntoApp();
/* Infinite loop */ /* Infinite loop */