Commit 9029d7d

authored

Merge pull request #317 from arduino/fix-buffer-overflow

Fix buffer-overflow assigning global Wire instances.

2 parents fe72ebf + 68f924b commit 9029d7dCopy full SHA for 9029d7d

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ extern "C" {`
`30`	`30`
`31`	`31`	`#include "Wire.h"`
`32`	`32`
`33`		`-TwoWire *TwoWire::g_SCIWires[TWOWIRE_MAX_I2C_CHANNELS] = {nullptr};`
`34`		`-TwoWire *TwoWire::g_I2CWires[TWOWIRE_MAX_SCI_CHANNELS] = {nullptr};`
	`33`	`+TwoWire *TwoWire::g_SCIWires[TWOWIRE_MAX_SCI_CHANNELS] = {nullptr};`
	`34`	`+TwoWire *TwoWire::g_I2CWires[TWOWIRE_MAX_I2C_CHANNELS] = {nullptr};`
`35`	`35`
`36`	`36`	`/* -------------------------------------------------------------------------- */`
`37`	`37`	`void TwoWire::setBusStatus(WireStatus_t ws) {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,8 @@ class TwoWire : public arduino::HardwareI2C {`
`152`	`152`
`153`	`153`	`private:`
`154`	`154`
`155`		`- static TwoWire *g_SCIWires[TWOWIRE_MAX_I2C_CHANNELS];`
`156`		`- static TwoWire *g_I2CWires[TWOWIRE_MAX_SCI_CHANNELS];`
	`155`	`+ static TwoWire *g_SCIWires[TWOWIRE_MAX_SCI_CHANNELS];`
	`156`	`+ static TwoWire *g_I2CWires[TWOWIRE_MAX_I2C_CHANNELS];`
`157`	`157`
`158`	`158`	`static void WireSCIMasterCallback(i2c_master_callback_args_t *);`
`159`	`159`	`static void WireMasterCallback(i2c_master_callback_args_t *);`

Comments

(0)