From c5cfacebc3dafbed2e48978c65ef7f805e08f87e Mon Sep 17 00:00:00 2001 From: Matthias Kolja Miehl Date: Sun, 21 Aug 2016 02:34:48 +0200 Subject: [PATCH] cpu/stm32l1: uart: make sure 'dev' is != NULL to avoid nullPointer errors --- cpu/stm32l1/periph/uart.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cpu/stm32l1/periph/uart.c b/cpu/stm32l1/periph/uart.c index 056f261d8f..ef037fcee8 100644 --- a/cpu/stm32l1/periph/uart.c +++ b/cpu/stm32l1/periph/uart.c @@ -113,6 +113,10 @@ static int init_base(uart_t uart, uint32_t baudrate) return -1; } + /* Make sure dev is != NULL here, i.e. that the variable is assigned in + * all non-returning branches of the switch at the top of this function. */ + assert(dev != NULL); + /* uart_configure RX and TX pins, set pin to use alternative function mode */ gpio_init(tx_pin, GPIO_OUT); gpio_init_af(tx_pin, af); @@ -157,6 +161,10 @@ void uart_write(uart_t uart, const uint8_t *data, size_t len) return; } + /* Make sure dev is != NULL here, i.e. that the variable is assigned in + * all non-returning branches of the switch at the top of this function. */ + assert(dev != NULL); + for (size_t i = 0; i < len; i++) { while (!(dev->SR & USART_SR_TXE)) {} dev->DR = data[i];