NUCLEO_F429ZI: Fix SPI ref impl - add null check in spi_transfer()

mprse · mprse · commit 450ebf9c804e · 2019-02-04T10:54:00.000+01:00
diff --git a/targets/TARGET_STM/stm_spi_api.c b/targets/TARGET_STM/stm_spi_api.c
@@ -525,7 +525,7 @@ uint32_t spi_transfer(spi_t *obj, const void *tx_buffer, uint32_t tx_length,
                         out = *(uint8_t *)write_fill;
                     }
                     in = spi_write(obj, out);
-                    if (i < rx_length) {
+                    if (rx_buffer && i < rx_length) {
                         ((uint8_t*)rx_buffer)[i] = (uint8_t)in;
                     }
                     break;
@@ -536,7 +536,7 @@ uint32_t spi_transfer(spi_t *obj, const void *tx_buffer, uint32_t tx_length,
                         out = *(uint16_t *)write_fill;
                     }
                     in = spi_write(obj, out);
-                    if (i < rx_length) {
+                    if (rx_buffer && i < rx_length) {
                         ((uint16_t*)rx_buffer)[i] = (uint16_t)in;
                     }
                     break;

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ uint32_t spi_transfer(spi_t obj, const void tx_buffer, uint32_t tx_length,`
`525`	`525`	`out = (uint8_t )write_fill;`
`526`	`526`	`}`
`527`	`527`	`in = spi_write(obj, out);`
`528`		`- if (i < rx_length) {`
	`528`	`+ if (rx_buffer && i < rx_length) {`
`529`	`529`	`((uint8_t*)rx_buffer)[i] = (uint8_t)in;`
`530`	`530`	`}`
`531`	`531`	`break;`
`@@ -536,7 +536,7 @@ uint32_t spi_transfer(spi_t obj, const void tx_buffer, uint32_t tx_length,`
`536`	`536`	`out = (uint16_t )write_fill;`
`537`	`537`	`}`
`538`	`538`	`in = spi_write(obj, out);`
`539`		`- if (i < rx_length) {`
	`539`	`+ if (rx_buffer && i < rx_length) {`
`540`	`540`	`((uint16_t*)rx_buffer)[i] = (uint16_t)in;`
`541`	`541`	`}`
`542`	`542`	`break;`