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

Make persistency safe

Browse source
This commit is contained in:
Sara Golemon 2004-07-20 05:08:52 +00:00
parent f3f7b6242d
commit fc7197322c
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ext/zlib/zlib_filter.c
View file

@ -23,7 +23,9 @@
/* {{{ data structure */ /* {{{ data structure */
/* Passed as opaque in malloc callbacks */
typedef struct _php_zlib_filter_data { typedef struct _php_zlib_filter_data {
int persistent;
z_stream strm; z_stream strm;
char *inbuf; char *inbuf;
size_t inbuf_len; size_t inbuf_len;
@ -37,12 +39,12 @@ typedef struct _php_zlib_filter_data {
static voidpf php_zlib_alloc(voidpf opaque, uInt items, uInt size) static voidpf php_zlib_alloc(voidpf opaque, uInt items, uInt size)
{ {
return (voidpf)safe_emalloc(items, size, 0); return (voidpf)pemalloc(items * size, ((php_zlib_filter_data*)opaque)->persistent);
} }
static void php_zlib_free(voidpf opaque, voidpf address) static void php_zlib_free(voidpf opaque, voidpf address)
{ {
efree((void*)address); pefree((void*)address, ((php_zlib_filter_data*)opaque)->persistent);
} }
/* }}} */ /* }}} */
@ -140,9 +142,9 @@ static void php_zlib_inflate_dtor(php_stream_filter *thisfilter TSRMLS_DC)
if (thisfilter && thisfilter->abstract) { if (thisfilter && thisfilter->abstract) {
php_zlib_filter_data *data = thisfilter->abstract; php_zlib_filter_data *data = thisfilter->abstract;
inflateEnd(&(data->strm)); inflateEnd(&(data->strm));
efree(data->inbuf); pefree(data->inbuf, data->persistent);
efree(data->outbuf); pefree(data->outbuf, data->persistent);
efree(data); pefree(data, data->persistent);
} }
} }
@ -248,9 +250,9 @@ static void php_zlib_deflate_dtor(php_stream_filter *thisfilter TSRMLS_DC)
if (thisfilter && thisfilter->abstract) { if (thisfilter && thisfilter->abstract) {
php_zlib_filter_data *data = thisfilter->abstract; php_zlib_filter_data *data = thisfilter->abstract;
deflateEnd(&(data->strm)); deflateEnd(&(data->strm));
efree(data->inbuf); pefree(data->inbuf, data->persistent);
efree(data->outbuf); pefree(data->outbuf, data->persistent);
efree(data); pefree(data, data->persistent);
} }
} }
@ -270,13 +272,8 @@ static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *f
php_zlib_filter_data *data; php_zlib_filter_data *data;
int status; int status;
if (persistent) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "this filter is not safe to use with a persistent stream");
return NULL;
}
/* Create this filter */ /* Create this filter */
data = ecalloc(1, sizeof(php_zlib_filter_data)); data = pecalloc(1, sizeof(php_zlib_filter_data), persistent);
/* Circular reference */ /* Circular reference */
data->strm.opaque = (voidpf) data; data->strm.opaque = (voidpf) data;
@ -284,9 +281,9 @@ static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *f
data->strm.zalloc = (alloc_func) php_zlib_alloc; data->strm.zalloc = (alloc_func) php_zlib_alloc;
data->strm.zfree = (free_func) php_zlib_free; data->strm.zfree = (free_func) php_zlib_free;
data->strm.avail_out = data->outbuf_len = data->inbuf_len = 2048; data->strm.avail_out = data->outbuf_len = data->inbuf_len = 2048;
data->strm.next_in = data->inbuf = (Bytef *) emalloc(data->inbuf_len); data->strm.next_in = data->inbuf = (Bytef *) pemalloc(data->inbuf_len, persistent);
data->strm.avail_in = 0; data->strm.avail_in = 0;
data->strm.next_out = data->outbuf = (Bytef *) emalloc(data->outbuf_len); data->strm.next_out = data->outbuf = (Bytef *) pemalloc(data->outbuf_len, persistent);
data->strm.data_type = Z_ASCII; data->strm.data_type = Z_ASCII;
if (strcasecmp(filtername, "zlib.inflate") == 0) { if (strcasecmp(filtername, "zlib.inflate") == 0) {
@ -384,9 +381,9 @@ factory_setlevel:
if (status != Z_OK) { if (status != Z_OK) {
/* Unspecified (probably strm) error, let stream-filter error do its own whining */ /* Unspecified (probably strm) error, let stream-filter error do its own whining */
efree(data->strm.next_in); pefree(data->strm.next_in, persistent);
efree(data->strm.next_out); pefree(data->strm.next_out, persistent);
efree(data); pefree(data, persistent);
return NULL; return NULL;
} }