Fix legit (?) cases of use-after-move

cataclysmbnteam · Nov 3, 2023 · 6d79737 · 6d79737
1 parent c78faaf
commit 6d79737
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/magic_spell_effect.cpp b/src/magic_spell_effect.cpp
@@ -754,7 +754,8 @@ void spell_effect::spawn_ethereal_item( const spell &sp, Creature &caster, const
     } else {
         you.i_add( std::move( granted ) );
     }
-    if( !granted->count_by_charges() ) {
+    // NOLINTNEXTLINE(bugprone-use-after-move)
+    if( granted && !granted->count_by_charges() ) {
         for( int i = 1; i < sp.damage(); i++ ) {
             you.i_add( item::spawn( as_item ) );
         }

diff --git a/tests/basecamp_test.cpp b/tests/basecamp_test.cpp
@@ -41,7 +41,8 @@ static detached_ptr<item> make_food( const itype_id &inner_food_id, int amount,
             can = item::spawn( unsealed_can_id, calendar::turn_zero );
             break;
     }
-    REQUIRE( can->contents.insert_item( std::move( food ) ).success() );
+    ret_val<bool> retval = can->contents.insert_item( std::move( food ) );
+    REQUIRE( retval.success() );
     return can;
 }