archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed segfault of stream handling

Browse source
This commit is contained in:
Xinchen Hui 2014-06-18 14:42:46 +08:00
parent 4c4dc8e239
commit 83d450c78d
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/mysqlnd/mysqlnd.c
View file

@ -998,7 +998,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,
SET_OOM_ERROR(*conn->error_info); SET_OOM_ERROR(*conn->error_info);
goto err; /* OOM */ goto err; /* OOM */
} }
conn->host_info = mnd_pestrdup(p, conn->persistent); conn->host_info = mnd_pestrdup(p, conn->persistent);
mnd_sprintf_free(p); mnd_sprintf_free(p);
if (!conn->host_info) { if (!conn->host_info) {
SET_OOM_ERROR(*conn->error_info); SET_OOM_ERROR(*conn->error_info);

4
ext/mysqlnd/mysqlnd_net.c
View file

@ -200,7 +200,7 @@ MYSQLND_METHOD(mysqlnd_net, open_tcp_or_unix)(MYSQLND_NET * const net, const cha
*/ */
zend_resource *le; zend_resource *le;
if ((le = zend_hash_str_find(&EG(persistent_list), hashed_details, hashed_details_len))) { if ((le = zend_hash_str_find_ptr(&EG(persistent_list), hashed_details, hashed_details_len))) {
/* /*
in_free will let streams code skip destructing - big HACK, in_free will let streams code skip destructing - big HACK,
but STREAMS suck big time regarding persistent streams. but STREAMS suck big time regarding persistent streams.
@ -223,7 +223,7 @@ MYSQLND_METHOD(mysqlnd_net, open_tcp_or_unix)(MYSQLND_NET * const net, const cha
unregistered yntil the script ends. So, we need to take care of that. unregistered yntil the script ends. So, we need to take care of that.
*/ */
net_stream->in_free = 1; net_stream->in_free = 1;
zend_hash_index_del(&EG(regular_list), net_stream->res->handle); /* ToDO: should it be res->handle, do streams register with addref ?*/ //????zend_hash_index_del(&EG(regular_list), net_stream->res->handle); /* ToDO: should it be res->handle, do streams register with addref ?*/
net_stream->in_free = 0; net_stream->in_free = 0;
DBG_RETURN(net_stream); DBG_RETURN(net_stream);

2
ext/mysqlnd/mysqlnd_result.c
View file

@ -1800,7 +1800,6 @@ MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, const unsigned int
Hint Zend how many elements we will have in the hash. Thus it won't Hint Zend how many elements we will have in the hash. Thus it won't
extend and rehash the hash constantly. extend and rehash the hash constantly.
*/ */
ZVAL_NEW_ARR(return_value);
array_init_size(return_value, mysqlnd_num_fields(result) * 2); array_init_size(return_value, mysqlnd_num_fields(result) * 2);
if (FAIL == result->m.fetch_row(result, (void *)return_value, flags, &fetched_anything TSRMLS_CC)) { if (FAIL == result->m.fetch_row(result, (void *)return_value, flags, &fetched_anything TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error while reading a row"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error while reading a row");
@ -1868,7 +1867,6 @@ MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, const unsigned int
} }
/* 4 is a magic value. The cast is safe, if larger then the array will be later extended - no big deal :) */ /* 4 is a magic value. The cast is safe, if larger then the array will be later extended - no big deal :) */
ZVAL_NEW_ARR(return_value);
array_init_size(return_value, set? (unsigned int) set->row_count : 4); array_init_size(return_value, set? (unsigned int) set->row_count : 4);
do { do {

6
ext/mysqlnd/mysqlnd_wireprotocol.c
View file

@ -1760,24 +1760,30 @@ php_mysqlnd_rowp_read_text_protocol_aux(MYSQLND_MEMORY_POOL_CHUNK * row_buffer,
bit_area += 1 + sprintf((char *)start, "%ld", Z_LVAL_P(current_field)); bit_area += 1 + sprintf((char *)start, "%ld", Z_LVAL_P(current_field));
//???? ZVAL_STRINGL(current_field, (char *) start, bit_area - start - 1, copy_data); //???? ZVAL_STRINGL(current_field, (char *) start, bit_area - start - 1, copy_data);
ZVAL_STRINGL(current_field, (char *) start, bit_area - start - 1); ZVAL_STRINGL(current_field, (char *) start, bit_area - start - 1);
/*
if (!copy_data) { if (!copy_data) {
efree(start); efree(start);
} }
*/
} else if (Z_TYPE_P(current_field) == IS_STRING){ } else if (Z_TYPE_P(current_field) == IS_STRING){
memcpy(bit_area, Z_STRVAL_P(current_field), Z_STRLEN_P(current_field)); memcpy(bit_area, Z_STRVAL_P(current_field), Z_STRLEN_P(current_field));
bit_area += Z_STRLEN_P(current_field); bit_area += Z_STRLEN_P(current_field);
*bit_area++ = '\0'; *bit_area++ = '\0';
zval_dtor(current_field); zval_dtor(current_field);
ZVAL_STRINGL(current_field, (char *) start, bit_area - start - 1); ZVAL_STRINGL(current_field, (char *) start, bit_area - start - 1);
/*
if (!copy_data) { if (!copy_data) {
efree(start); efree(start);
} }
*/
} }
} else { } else {
ZVAL_STRINGL(current_field, (char *)p, len); ZVAL_STRINGL(current_field, (char *)p, len);
/*
if (!copy_data) { if (!copy_data) {
efree(p); efree(p);
} }
*/
} }
p += len; p += len;
last_field_was_string = TRUE; last_field_was_string = TRUE;