From 565c1e126078b08a303a310068b5890ef86951d6 Mon Sep 17 00:00:00 2001 From: Ben Lubar Date: Thu, 5 Apr 2018 16:49:30 -0500 Subject: [PATCH] Fix uninitialized pointer being returned from Gui::getAnyUnit when on the pet list with no selection. --- library/modules/Gui.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index e3cebd45e..53bacb129 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -917,11 +917,13 @@ df::unit *Gui::getAnyUnit(df::viewscreen *top) if (VIRTUAL_CAST_VAR(screen, df::viewscreen_petst, top)) { + df::viewscreen_petst::T_animal animal_default; + animal_default.unit = NULL; switch (screen->mode) { case df::viewscreen_petst::List: if (!vector_get(screen->is_vermin, screen->cursor)) - return vector_get(screen->animal, screen->cursor).unit; + return vector_get(screen->animal, screen->cursor, animal_default).unit; return NULL; case df::viewscreen_petst::SelectTrainer: