Skip to content

Commit

Permalink
cpu/stm32l1: uart: make sure 'dev' is != NULL to avoid nullPointer er…
Browse files Browse the repository at this point in the history
…rors
  • Loading branch information
makomi committed Sep 13, 2016
1 parent 39ecc12 commit c5cface
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions cpu/stm32l1/periph/uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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];
Expand Down

0 comments on commit c5cface

Please sign in to comment.