Merge pull request #33 from Sensirion/fix-buffer-overflow

Fix SCD30 buffer overflow, update embedded-common
Sensirion · Oct 31, 2019 · a164482 · a164482
2 parents 3d915ce + 391aaa7
commit a164482
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+ * [`fixed`]    SCD30: Fix buffer overflow when reading measurements that was
+                introduced in 2.0.1.
+
 ## [2.0.1] - 2019-10-17
 
  * [`fixed`]    Copy correct `AUTHORS`, `CHANGELOG.md`, `LICENSE`, and

diff --git a/embedded-common b/embedded-common
diff --git a/scd30/scd30.c b/scd30/scd30.c
@@ -88,8 +88,9 @@ int16_t scd30_read_measurement(float32_t *co2_ppm, float32_t *temperature,
         sensirion_i2c_write_cmd(SCD30_I2C_ADDRESS, SCD30_CMD_READ_MEASUREMENT);
     if (ret != STATUS_OK)
         return ret;
-    ret =
-        sensirion_i2c_read_bytes(SCD30_I2C_ADDRESS, data->bytes, sizeof(data));
+
+    ret = sensirion_i2c_read_words_as_bytes(SCD30_I2C_ADDRESS, data->bytes,
+                                            SENSIRION_NUM_WORDS(data));
     if (ret != STATUS_OK)
         return ret;
 
@@ -194,8 +195,8 @@ int16_t scd30_read_serial(char *serial) {
         return ret;
 
     sensirion_sleep_usec(SCD30_WRITE_DELAY_US);
-    ret = sensirion_i2c_read_bytes(SCD30_I2C_ADDRESS, (uint8_t *)serial,
-                                   SCD30_SERIAL_NUM_WORDS);
+    ret = sensirion_i2c_read_words_as_bytes(
+        SCD30_I2C_ADDRESS, (uint8_t *)serial, SCD30_SERIAL_NUM_WORDS);
     serial[2 * SCD30_SERIAL_NUM_WORDS] = '\0';
     return ret;
 }
+4 −3		hw_i2c/sensirion_hw_i2c_implementation.c
+4 −3		sensirion_common.c
+4 −3		sensirion_common.h