Check for error packet while doing handshake

If an error packet is received instead of the expected handshake packet the function returns DRIZZLE_RETURN_ERROR_CODE Addresses #120
sociomantic-tsunami · Mar 24, 2017 · 2352e6f · 2352e6f
1 parent ded4898
commit 2352e6f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/libdrizzle/handshake.cc b/libdrizzle/handshake.cc
@@ -99,7 +99,11 @@ drizzle_return_t drizzle_state_handshake_server_read(drizzle_st *con)
     return DRIZZLE_RETURN_OK;
   }
 
-  if (con->packet_size < 46)
+  if (drizzle_check_unpack_error(con))
+  {
+    return DRIZZLE_RETURN_ERROR_CODE;
+  }
+  else if (con->packet_size < 46)
   {
     drizzle_set_error(con, __func__,
                       "bad packet size:>=46:%" PRIu32, con->packet_size);