zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🚑️ Prevent BFT unaligned compressed data corruption (#22134)

Browse source
This commit is contained in:
ellensp 2021-06-15 09:43:50 +12:00 committed by Scott Lahteine
parent dba877311e
commit cdd9507493
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Marlin/src/feature/binary_stream.h
View file

@ -24,9 +24,11 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#define BINARY_STREAM_COMPRESSION #define BINARY_STREAM_COMPRESSION
#if ENABLED(BINARY_STREAM_COMPRESSION) #if ENABLED(BINARY_STREAM_COMPRESSION)
#include "../libs/heatshrink/heatshrink_decoder.h" #include "../libs/heatshrink/heatshrink_decoder.h"
// STM32 (and others?) require a word-aligned buffer for SD card transfers via DMA
static __attribute__((aligned(sizeof(size_t)))) uint8_t decode_buffer[512] = {};
static heatshrink_decoder hsd;
#endif #endif
inline bool bs_serial_data_available(const serial_index_t index) { inline bool bs_serial_data_available(const serial_index_t index) {
@ -37,16 +39,6 @@ inline int bs_read_serial(const serial_index_t index) {
return SERIAL_IMPL.read(index); return SERIAL_IMPL.read(index);
} }
#if ENABLED(BINARY_STREAM_COMPRESSION)
static heatshrink_decoder hsd;
#if BOTH(ARDUINO_ARCH_STM32F1, SDIO_SUPPORT)
// STM32 requires a word-aligned buffer for SD card transfers via DMA
static __attribute__((aligned(sizeof(size_t)))) uint8_t decode_buffer[512] = {};
#else
static uint8_t decode_buffer[512] = {};
#endif
#endif
class SDFileTransferProtocol { class SDFileTransferProtocol {
private: private:
struct Packet { struct Packet {