Check for nullptr (item not in any container)

CleverRaven · Jan 25, 2016 · 3504233 · 3504233
1 parent 6d91e1a
commit 3504233
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/item_location.cpp b/src/item_location.cpp
@@ -196,7 +196,7 @@ class item_location::item_on_person : public item_location::impl {
         } else {
             // Unpack the object followed by any nested containers starting with the innermost
             mv += dynamic_cast<player *>( who )->item_handling_cost( *it );
-            for( auto obj = who->find_parent( *it ); who->find_parent( *obj ); obj = who->find_parent( *obj ) ) {
+            for( auto obj = who->find_parent( *it ); obj && who->find_parent( *obj ); obj = who->find_parent( *obj ) ) {
                 mv += dynamic_cast<player *>( who )->item_handling_cost( *obj );
             }
         }