From b37cad22bc39635839bdd5250aafe0658a3ae189 Mon Sep 17 00:00:00 2001 From: Lukas Jiriste Date: Fri, 25 Oct 2024 16:52:39 +0200 Subject: [PATCH] Harden methods against nullptr argument --- ex03/Character.cpp | 2 ++ ex03/MateriaSource.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ex03/Character.cpp b/ex03/Character.cpp index 64c4526..65e67de 100644 --- a/ex03/Character.cpp +++ b/ex03/Character.cpp @@ -41,6 +41,8 @@ Character &Character::operator=(const Character &other) void Character::equip(AMateria *materia) { + if (materia == NULL) + return ; for (size_t i(0); i < INVENTORY_SIZE; ++i) if (m_inventory[i] == NULL) { diff --git a/ex03/MateriaSource.cpp b/ex03/MateriaSource.cpp index a84d6fc..97678f5 100644 --- a/ex03/MateriaSource.cpp +++ b/ex03/MateriaSource.cpp @@ -35,6 +35,8 @@ MateriaSource &MateriaSource::operator=(const MateriaSource &other) void MateriaSource::learnMateria(AMateria *materia) { + if (materia == NULL) + return ; if (m_num_known == max_known) return ; m_known_materia[m_num_known] = materia->clone(); -- 2.30.2