Merge pull request #623 from facchinm/i2c_null_pointers_on_end

facchinm · web-flow · commit 2f8fd837b3a6 · 2023-02-15T09:25:57.000+01:00
Wire: nullify pointers on end()
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
@@ -45,13 +45,15 @@ void arduino::MbedI2C::begin(uint8_t slaveAddr) {
 void arduino::MbedI2C::end() {
 	if (master != NULL) {
 		delete master;
+		master = NULL;
 	}
 #ifdef DEVICE_I2CSLAVE
 	if (slave != NULL) {
 		slave_th->terminate();
 		slave_th->free_stack();
 		delete slave_th;
 		delete slave;
+		slave = NULL;
 	}
 #endif
 }

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,15 @@ void arduino::MbedI2C::begin(uint8_t slaveAddr) {`
`45`	`45`	`void arduino::MbedI2C::end() {`
`46`	`46`	`if (master != NULL) {`
`47`	`47`	`delete master;`
	`48`	`+ master = NULL;`
`48`	`49`	`}`
`49`	`50`	`#ifdef DEVICE_I2CSLAVE`
`50`	`51`	`if (slave != NULL) {`
`51`	`52`	`slave_th->terminate();`
`52`	`53`	`slave_th->free_stack();`
`53`	`54`	`delete slave_th;`
`54`	`55`	`delete slave;`
	`56`	`+ slave = NULL;`
`55`	`57`	`}`
`56`	`58`	`#endif`
`57`	`59`	`}`