Cap the maximum size of GraphData buffer to 32768 values.

Signed-off-by: Kang-Che Sung <[email protected]>
htop-dev · Oct 10, 2023 · 83041f3 · 83041f3
1 parent 1a9ae38
commit 83041f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Meter.c b/Meter.c
@@ -299,14 +299,19 @@ static void GraphMeterMode_draw(Meter* this, int x, int y, int w) {
       return;
 
    GraphData* data = &this->drawData;
-   if ((size_t)w * 2 > data->nValues) {
+   if ((size_t)w * 2 > data->nValues && MAX_METER_GRAPHDATA_VALUES > data->nValues) {
       size_t oldNValues = data->nValues;
-      data->nValues = MAXIMUM(oldNValues + (oldNValues / 2), (size_t)w * 2);
+      data->nValues = MAXIMUM(oldNValues + oldNValues / 2, (size_t)w * 2);
+      data->nValues = MINIMUM(data->nValues, MAX_METER_GRAPHDATA_VALUES);
       data->values = xReallocArray(data->values, data->nValues, sizeof(*data->values));
       memmove(data->values + (data->nValues - oldNValues), data->values, oldNValues * sizeof(*data->values));
       memset(data->values, 0, (data->nValues - oldNValues) * sizeof(*data->values));
    }
    const size_t nValues = data->nValues;
+   if ((size_t)w * 2 > nValues) {
+      x += w - nValues / 2;
+      w = nValues / 2;
+   }
 
    const Machine* host = this->host;
    if (!timercmp(&host->realtime, &(data->time), <)) {

diff --git a/Meter.h b/Meter.h
@@ -20,6 +20,7 @@ in the source distribution for its full text.
 
 
 #define METER_TXTBUFFER_LEN 256
+#define MAX_METER_GRAPHDATA_VALUES 32768
 
 #define METER_BUFFER_CHECK(buffer, size, written)          \
    do {                                                    \
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ in the source distribution for its full text. @@
     #define METER_TXTBUFFER_LEN 256
+    #define MAX_METER_GRAPHDATA_VALUES 32768
     #define METER_BUFFER_CHECK(buffer, size, written)          \
        do {                                                    \
@@ Expand Down @@