diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-06-13 12:39:56 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-06-13 12:39:56 +0300 |
| commit | 100b4cdabdf8be5434f94d5922001258465ca2f4 (patch) | |
| tree | b86ae4e3975380163277d7b3e3b04f089e5cfe81 /ext/mysqlnd/mysqlnd_wireprotocol.c | |
| parent | 9465ec4673ccce985e093bea0786ff5c6d0e07ac (diff) | |
| download | php-git-100b4cdabdf8be5434f94d5922001258465ca2f4.tar.gz | |
emalloc() never returns NULL
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 4 |
1 files changed, 1 insertions, 3 deletions
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 */ |