Merge pull request adafruit#3497 from jepler/issue3473

tannewt · web-flow · commit b9890f2d4206 · 2020-10-01T11:00:25.000-07:00
sharpdisplay: Fix memory corruption across soft-reset
diff --git a/shared-module/sharpdisplay/SharpMemoryFramebuffer.c b/shared-module/sharpdisplay/SharpMemoryFramebuffer.c
@@ -90,10 +90,6 @@ bool common_hal_sharpdisplay_framebuffer_get_pixels_in_byte_share_row(sharpdispl
 }
 
 void common_hal_sharpdisplay_framebuffer_reset(sharpdisplay_framebuffer_obj_t *self) {
-    if (!allocation_from_ptr(self->bufinfo.buf)) {
-        self->bufinfo.buf = NULL;
-    }
-
     if (self->bus != &self->inline_bus
 #if BOARD_SPI
         && self->bus != common_hal_board_get_spi()
@@ -105,7 +101,9 @@ void common_hal_sharpdisplay_framebuffer_reset(sharpdisplay_framebuffer_obj_t *s
 }
 
 void common_hal_sharpdisplay_framebuffer_reconstruct(sharpdisplay_framebuffer_obj_t *self) {
-
+    if (!allocation_from_ptr(self->bufinfo.buf)) {
+        self->bufinfo.buf = NULL;
+    }
 }
 
 void common_hal_sharpdisplay_framebuffer_get_bufinfo(sharpdisplay_framebuffer_obj_t *self, mp_buffer_info_t *bufinfo) {

Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,6 @@ bool common_hal_sharpdisplay_framebuffer_get_pixels_in_byte_share_row(sharpdispl`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`void common_hal_sharpdisplay_framebuffer_reset(sharpdisplay_framebuffer_obj_t *self) {`
`93`		`- if (!allocation_from_ptr(self->bufinfo.buf)) {`
`94`		`- self->bufinfo.buf = NULL;`
`95`		`- }`
`96`		`-`
`97`	`93`	`if (self->bus != &self->inline_bus`
`98`	`94`	`#if BOARD_SPI`
`99`	`95`	`&& self->bus != common_hal_board_get_spi()`
`@@ -105,7 +101,9 @@ void common_hal_sharpdisplay_framebuffer_reset(sharpdisplay_framebuffer_obj_t *s`
`105`	`101`	`}`
`106`	`102`
`107`	`103`	`void common_hal_sharpdisplay_framebuffer_reconstruct(sharpdisplay_framebuffer_obj_t *self) {`
`108`		`-`
	`104`	`+ if (!allocation_from_ptr(self->bufinfo.buf)) {`
	`105`	`+ self->bufinfo.buf = NULL;`
	`106`	`+ }`
`109`	`107`	`}`
`110`	`108`
`111`	`109`	`void common_hal_sharpdisplay_framebuffer_get_bufinfo(sharpdisplay_framebuffer_obj_t self, mp_buffer_info_t bufinfo) {`