Commit 8530039a authored by Steven Danneman's avatar Steven Danneman Committed by Rich Salz
Browse files

Fix double array increment in s_client mysql connect 



The packet parsing code for the server version string was incrementing
the array index twice on every iteration. This meant that strings with
an even number of characters would pass, but strings with an odd number
(ex: 5.7.18-0ubuntu0.16.04.1) would cause the pos variable to get out
of sync.

This would cause a later failure with "MySQL packet is broken."

CLA: trivial

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3799)
parent 6fc1d33c

apps/s_client.c

+1 −2
Original line number Diff line number Diff line
@@ -2406,10 +2406,9 @@ int s_client_main(int argc, char **argv) 
                } else if (packet[pos++] == '\0') {

                    break;

                }

                pos++;

            }



            /* make sure we have more 15 bytes left in the packet */

            /* make sure we have at least 15 bytes left in the packet */

            if (pos + 15 > bytes) {

                BIO_printf(bio_err,

                           "MySQL server handshake packet is broken.\n");