Merge branch 'infocoredump' of BenBE/htop

Author: Daniel Lange

InfoScreen.c

@@ -77,11 +77,17 @@ void InfoScreen_addLine(InfoScreen* this, const char* line) {
 }
 
 void InfoScreen_appendLine(InfoScreen* this, const char* line) {
-   ListItem* last = (ListItem*)Vector_get(this->lines, Vector_size(this->lines) - 1);
-   ListItem_append(last, line);
+   if (!Vector_size(this->lines)) {
+      InfoScreen_addLine(this, line);
+      return;
+   }
+
+   Object* last = Vector_get(this->lines, Vector_size(this->lines) - 1);
+   ListItem_append((ListItem*)last, line);
    const char* incFilter = IncSet_filter(this->inc);
-   if (incFilter && Panel_get(this->display, Panel_size(this->display) - 1) != (Object*)last && String_contains_i(line, incFilter, true)) {
-      Panel_add(this->display, (Object*)last);
+   Object* displayLast = Panel_size(this->display) ? Panel_get(this->display, Panel_size(this->display) - 1) : NULL;
+   if (incFilter && displayLast != last && String_contains_i(line, incFilter, true)) {
+      Panel_add(this->display, last);
    }
 }
 

Vector.c

@@ -80,7 +80,9 @@ bool Vector_countEquals(const Vector* this, unsigned int expectedCount) {
 }
 
 Object* Vector_get(const Vector* this, int idx) {
-   assert(idx >= 0 && idx < this->items);
+   assert(idx >= 0);
+   assert(idx < this->arraySize);
+   assert(idx < this->items);
    assert(this->array[idx]);
    assert(Object_isA(this->array[idx], this->type));
    return this->array[idx];