Fix infinite loop in event deserialisation

serenity-rs · Mar 25, 2024 · e4b9313 · e4b9313
1 parent 99a0d9e
commit e4b9313
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/internal/utils.rs b/src/internal/utils.rs
@@ -16,7 +16,8 @@ pub(crate) fn join_to_string(
 // Required because of https://github.com/Crazytieguy/gat-lending-iterator/issues/31
 macro_rules! lending_for_each {
  ($iter:expr, |$item:ident| $body:expr ) => {
- while let Some(mut $item) = $iter.next() {
+ let mut __iter = $iter;
+ while let Some(mut $item) = __iter.next() {
  $body
  }
  };

diff --git a/src/model/application/command_interaction.rs b/src/model/application/command_interaction.rs
@@ -245,8 +245,8 @@ impl<'de> Deserialize<'de> for CommandInteraction {
  interaction.user = member.user.clone();
  }
 
- let mut role_iter = interaction.data.resolved.roles.iter_mut();
- lending_for_each!(role_iter, |r| r.guild_id = guild_id);
+ let iter = interaction.data.resolved.roles.iter_mut();
+ lending_for_each!(iter, |r| r.guild_id = guild_id);
  }
  Ok(interaction)
  }