From 100b4cdabdf8be5434f94d5922001258465ca2f4 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 13 Jun 2018 12:39:56 +0300 Subject: emalloc() never returns NULL --- ext/mysqlnd/mysqlnd_wireprotocol.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c') diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 20b82ac658..775192ba12 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -427,9 +427,7 @@ php_mysqlnd_greet_read(MYSQLND_CONN_DATA * conn, void * _packet) if (packet->authentication_plugin_data.l > SCRAMBLE_LENGTH) { /* more data*/ char * new_auth_plugin_data = emalloc(packet->authentication_plugin_data.l); - if (!new_auth_plugin_data) { - goto premature_end; - } + /* copy what we already have */ memcpy(new_auth_plugin_data, packet->authentication_plugin_data.s, SCRAMBLE_LENGTH); /* add additional scramble data 5.5+ sent us */ -- cgit v1.2.1