Prevent malformed opus data from crashing the bot process (#149)

2 files changed, 84 insertions, 76 deletions

diff --git a/src/client/context.rs b/src/client/context.rs
index d0600b6..1bd5ed7 100644
--- a/src/client/context.rs
+++ b/src/client/context.rs
@@ -78,23 +78,25 @@ impl Context {
     pub fn edit_profile<F: FnOnce(EditProfile) -> EditProfile>(&self, f: F) -> Result<CurrentUser> {
         let mut map = Map::new();
 
-        feature_cache! {{
-                            let cache = CACHE.read().unwrap();
-        
-                            map.insert("username".to_owned(), Value::String(cache.user.name.clone()));
-        
-                            if let Some(email) = cache.user.email.as_ref() {
-                                map.insert("email".to_owned(), Value::String(email.clone()));
-                            }
-                        } else {
-                            let user = http::get_current_user()?;
-        
-                            map.insert("username".to_owned(), Value::String(user.name.clone()));
-        
-                            if let Some(email) = user.email.as_ref() {
-                                map.insert("email".to_owned(), Value::String(email.clone()));
-                            }
-                        }}
+        feature_cache! {
+            {
+                let cache = CACHE.read().unwrap();
+
+                map.insert("username".to_owned(), Value::String(cache.user.name.clone()));
+
+                if let Some(email) = cache.user.email.as_ref() {
+                    map.insert("email".to_owned(), Value::String(email.clone()));
+                }
+            } else {
+                let user = http::get_current_user()?;
+
+                map.insert("username".to_owned(), Value::String(user.name.clone()));
+
+                if let Some(email) = user.email.as_ref() {
+                    map.insert("email".to_owned(), Value::String(email.clone()));
+                }
+            }
+        }
 
         let edited = f(EditProfile(map)).0;
 
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index 461fe8c..68f31ef 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -386,26 +386,28 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
             let context = context(conn, data);
 
             let h = event_handler.clone();
-            feature_cache! {{
-                                                                // This is safe to unwrap, as the update would have created
-                                                                // the member if it did not exist. So, there is be _no_ way
-                                                                // that this could fail under any circumstance.
-                                                                let after = CACHE.read()
-                                                                    .unwrap()
-                                                                    .member(event.guild_id, event.user.id)
-                                                                    .unwrap()
-                                                                    .clone();
-            
-                                                                tokio_handle.spawn_fn(move || {
-                                                                    h.on_guild_member_update(context, _before, after);
-                                                                    Ok(())
-                                                                });
-                                                            } else {
-                                                                tokio_handle.spawn_fn(move || {
-                                                                    h.on_guild_member_update(context, event);
-                                                                    Ok(())
-                                                                });
-                                                            }}
+            feature_cache! {
+                {
+                    // This is safe to unwrap, as the update would have created
+                    // the member if it did not exist. So, there is be _no_ way
+                    // that this could fail under any circumstance.
+                    let after = CACHE.read()
+                        .unwrap()
+                        .member(event.guild_id, event.user.id)
+                        .unwrap()
+                        .clone();
+
+                    tokio_handle.spawn_fn(move || {
+                        h.on_guild_member_update(context, _before, after);
+                        Ok(())
+                    });
+                } else {
+                    tokio_handle.spawn_fn(move || {
+                        h.on_guild_member_update(context, event);
+                        Ok(())
+                    });
+                }
+            }
         },
         Event::GuildMembersChunk(event) => {
             update!(update_with_guild_members_chunk, event);
@@ -484,23 +486,25 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
             let context = context(conn, data);
 
             let h = event_handler.clone();
-            feature_cache! {{
-                                                                let before = CACHE.read()
-                                                                    .unwrap()
-                                                                    .guilds
-                                                                    .get(&event.guild.id)
-                                                                    .cloned();
-            
-                                                                tokio_handle.spawn_fn(move || {
-                                                                    h.on_guild_update(context, before, event.guild);
-                                                                    Ok(())
-                                                                });
-                                                            } else {
-                                                                tokio_handle.spawn_fn(move || {
-                                                                    h.on_guild_update(context, event.guild);
-                                                                    Ok(())
-                                                                });
-                                                            }}
+            feature_cache! {
+                {
+                    let before = CACHE.read()
+                        .unwrap()
+                        .guilds
+                        .get(&event.guild.id)
+                        .cloned();
+
+                    tokio_handle.spawn_fn(move || {
+                        h.on_guild_update(context, before, event.guild);
+                        Ok(())
+                    });
+                } else {
+                    tokio_handle.spawn_fn(move || {
+                        h.on_guild_update(context, event.guild);
+                        Ok(())
+                    });
+                }
+            }
         },
         // Already handled by the framework check macro
         Event::MessageCreate(_) => {},
@@ -593,28 +597,30 @@ fn handle_event<H: EventHandler + 'static>(event: Event,
         Event::Ready(event) => {
             update!(update_with_ready, event);
 
-            feature_cache!{{
-                                                                last_guild_create_time = now!();
-            
-                                                                let _ = wait_for_guilds()
-                                                                .map(|_| {
-                                                                    let context = context(conn, data);
-            
-                                                                    let h = event_handler.clone();
-                                                                    tokio_handle.spawn_fn(move || {
-                                                                        h.on_ready(context, event.ready);
-                                                                        Ok(())
-                                                                    });
-                                                                });
-                                                            } else {
-                                                               let context = context(conn, data);
-            
-                                                                let h = event_handler.clone();
-                                                                tokio_handle.spawn_fn(move || {
-                                                                    h.on_ready(context, event.ready);
-                                                                    Ok(())
-                                                                });
-                                                            }}
+            feature_cache!{
+                {
+                    last_guild_create_time = now!();
+
+                    let _ = wait_for_guilds()
+                    .map(|_| {
+                        let context = context(conn, data);
+
+                        let h = event_handler.clone();
+                        tokio_handle.spawn_fn(move || {
+                            h.on_ready(context, event.ready);
+                            Ok(())
+                        });
+                    });
+                } else {
+                    let context = context(conn, data);
+
+                    let h = event_handler.clone();
+                    tokio_handle.spawn_fn(move || {
+                        h.on_ready(context, event.ready);
+                        Ok(())
+                    });
+                }
+            }
         },
         Event::Resumed(event) => {
             let context = context(conn, data);