From fe4b07c610261df6b2d63e5b216248a6c8e78d8c Mon Sep 17 00:00:00 2001
From: Jean-François Milants <jf@codingfield.com>
Date: Sun, 10 Dec 2023 11:13:18 +0100
Subject: Simple Weather Service : fix out of bounds access while creating
 Forecast instance.

---
 src/components/ble/SimpleWeatherService.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/components/ble/SimpleWeatherService.cpp')

diff --git a/src/components/ble/SimpleWeatherService.cpp b/src/components/ble/SimpleWeatherService.cpp
index 729e9352..9735f2d1 100644
--- a/src/components/ble/SimpleWeatherService.cpp
+++ b/src/components/ble/SimpleWeatherService.cpp
@@ -19,6 +19,8 @@
 #include "SimpleWeatherService.h"
 #include <cstring>
 #include <nrf_log.h>
+#include <array>
+
 using namespace Pinetime::Controllers;
 
 namespace {
@@ -42,8 +44,10 @@ namespace {
     uint64_t timestamp = static_cast<uint64_t>(dataBuffer[2] + (dataBuffer[3] << 8) + (dataBuffer[4] << 16) + (dataBuffer[5] << 24) +
                                                ((uint64_t) dataBuffer[6] << 32) + ((uint64_t) dataBuffer[7] << 40) +
                                                ((uint64_t) dataBuffer[8] << 48) + ((uint64_t) dataBuffer[9] << 54));
-    uint8_t nbDays = dataBuffer[10];
-    std::array<SimpleWeatherService::Forecast::Day, 5> days;
+
+    std::array<SimpleWeatherService::Forecast::Day, SimpleWeatherService::MaxNbForecastDays> days;
+    const uint8_t nbDaysInBuffer = dataBuffer[10];
+    const uint8_t nbDays = std::min(SimpleWeatherService::MaxNbForecastDays, nbDaysInBuffer);
     for (int i = 0; i < nbDays; i++) {
       days[i] = SimpleWeatherService::Forecast::Day {dataBuffer[11 + (i * 3)], dataBuffer[12 + (i * 3)], dataBuffer[13 + (i * 3)]};
     }
-- 
cgit v1.2.3-70-g09d2