Avoid panicking if packet empty (#1667)

I'm having panics on those index accesses, an empty packet is probably a symptom of other problems, but it would be cool if the application doesn't panics like it does.
launchbadge · Feb 16, 2022 · 2849468 · 2849468
1 parent 7fb54d3
commit 2849468
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sqlx-core/src/mysql/connection/stream.rs b/sqlx-core/src/mysql/connection/stream.rs
@@ -83,7 +83,7 @@ impl MySqlStream {
             while self.waiting.front() == Some(&Waiting::Row) {
                 let packet = self.recv_packet().await?;
 
-                if packet[0] == 0xfe && packet.len() < 9 {
+                if !packet.is_empty() && packet[0] == 0xfe && packet.len() < 9 {
                     let eof = packet.eof(self.capabilities)?;
 
                     if eof.status.contains(Status::SERVER_MORE_RESULTS_EXISTS) {
@@ -97,7 +97,7 @@ impl MySqlStream {
             while self.waiting.front() == Some(&Waiting::Result) {
                 let packet = self.recv_packet().await?;
 
-                if packet[0] == 0x00 || packet[0] == 0xff {
+                if !packet.is_empty() && (packet[0] == 0x00 || packet[0] == 0xff) {
                     let ok = packet.ok()?;
 
                     if !ok.status.contains(Status::SERVER_MORE_RESULTS_EXISTS) {