Harden methods against nullptr argument trunk
authorLukas Jiriste <ljiriste@student.42prague.com>
Fri, 25 Oct 2024 14:52:39 +0000 (16:52 +0200)
committerLukas Jiriste <ljiriste@student.42prague.com>
Fri, 25 Oct 2024 14:52:39 +0000 (16:52 +0200)
ex03/Character.cpp
ex03/MateriaSource.cpp

index 64c4526523344682efb1338f31489cca5e86412e..65e67de6af30245a2cd53da614fbb77af509bd13 100644 (file)
@@ -41,6 +41,8 @@ Character     &Character::operator=(const Character &other)
 
 void   Character::equip(AMateria *materia)
 {
 
 void   Character::equip(AMateria *materia)
 {
+       if (materia == NULL)
+               return ;
        for (size_t i(0); i < INVENTORY_SIZE; ++i)
                if (m_inventory[i] == NULL)
                {
        for (size_t i(0); i < INVENTORY_SIZE; ++i)
                if (m_inventory[i] == NULL)
                {
index a84d6fcb550d59cf054d15bda511e4efc2487aa5..97678f56e27e22d5fd41c76006b15bd6142885ae 100644 (file)
@@ -35,6 +35,8 @@ MateriaSource &MateriaSource::operator=(const MateriaSource &other)
 
 void   MateriaSource::learnMateria(AMateria *materia)
 {
 
 void   MateriaSource::learnMateria(AMateria *materia)
 {
+       if (materia == NULL)
+               return ;
        if (m_num_known == max_known)
                return ;
        m_known_materia[m_num_known] = materia->clone();
        if (m_num_known == max_known)
                return ;
        m_known_materia[m_num_known] = materia->clone();