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

Fix buffer-overflow assigning global Wire instances.

Author: facchinm

libraries/Wire/Wire.cpp

@@ -30,8 +30,8 @@ extern "C" {
 
 #include "Wire.h"
 
-TwoWire *TwoWire::g_SCIWires[TWOWIRE_MAX_I2C_CHANNELS] = {nullptr};
-TwoWire *TwoWire::g_I2CWires[TWOWIRE_MAX_SCI_CHANNELS] = {nullptr};
+TwoWire *TwoWire::g_SCIWires[TWOWIRE_MAX_SCI_CHANNELS] = {nullptr};
+TwoWire *TwoWire::g_I2CWires[TWOWIRE_MAX_I2C_CHANNELS] = {nullptr};
 
 /* -------------------------------------------------------------------------- */
 void TwoWire::setBusStatus(WireStatus_t ws) {

libraries/Wire/Wire.h

@@ -152,8 +152,8 @@ class TwoWire : public arduino::HardwareI2C {
 
   private:
 
-    static TwoWire *g_SCIWires[TWOWIRE_MAX_I2C_CHANNELS];
-    static TwoWire *g_I2CWires[TWOWIRE_MAX_SCI_CHANNELS];
+    static TwoWire *g_SCIWires[TWOWIRE_MAX_SCI_CHANNELS];
+    static TwoWire *g_I2CWires[TWOWIRE_MAX_I2C_CHANNELS];
 
     static void WireSCIMasterCallback(i2c_master_callback_args_t *);
     static void WireMasterCallback(i2c_master_callback_args_t *);