Merge pull request #2320 from jepler/nrf-unsigned-audio-crash

dhalbert · web-flow · commit d154d1191134 · 2019-11-25T11:42:16.000-05:00
nrf: i2sout: Fix double-increment when copying samples
diff --git a/ports/nrf/common-hal/audiobusio/I2SOut.c b/ports/nrf/common-hal/audiobusio/I2SOut.c
@@ -139,14 +139,14 @@ static void i2s_buffer_fill(audiobusio_i2sout_obj_t* self) {
             uint16_t *bp = (uint16_t*)buffer;
             uint16_t *be = (uint16_t*)(buffer + bytecount);
             uint16_t *sp = (uint16_t*)self->sample_data;
-            for (; bp != be; bp++) {
+            for (; bp < be;) {
                 *bp++ = *sp++ + 0x8000;
             }
         } else {
             uint8_t *bp = (uint8_t*)buffer;
             uint8_t *be = (uint8_t*)(buffer + bytecount);
             uint8_t *sp = (uint8_t*)self->sample_data;
-            for (; bp != be; bp++) {
+            for (; bp < be;) {
                 *bp++ = *sp++ + 0x80;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -139,14 +139,14 @@ static void i2s_buffer_fill(audiobusio_i2sout_obj_t* self) {`
`139`	`139`	`uint16_t bp = (uint16_t)buffer;`
`140`	`140`	`uint16_t be = (uint16_t)(buffer + bytecount);`
`141`	`141`	`uint16_t sp = (uint16_t)self->sample_data;`
`142`		`- for (; bp != be; bp++) {`
	`142`	`+ for (; bp < be;) {`
`143`	`143`	`bp++ = sp++ + 0x8000;`
`144`	`144`	`}`
`145`	`145`	`} else {`
`146`	`146`	`uint8_t bp = (uint8_t)buffer;`
`147`	`147`	`uint8_t be = (uint8_t)(buffer + bytecount);`
`148`	`148`	`uint8_t sp = (uint8_t)self->sample_data;`
`149`		`- for (; bp != be; bp++) {`
	`149`	`+ for (; bp < be;) {`
`150`	`150`	`bp++ = sp++ + 0x80;`
`151`	`151`	`}`
`152`	`152`	`}`