mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use ngx_calloc_buf() where appropriate.

Browse Source
This commit is contained in:
Ruslan Ermilov 2017-04-12 22:21:04 +03:00
parent f947167442
commit cac361718c
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/modules/ngx_http_flv_module.c
View File

@ -203,7 +203,7 @@ ngx_http_flv_handler(ngx_http_request_t *r)
} }
if (i == 0) { if (i == 0) {
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
@ -217,7 +217,7 @@ ngx_http_flv_handler(ngx_http_request_t *r)
} }
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }

2
src/http/modules/ngx_http_gzip_filter_module.c
View File

@ -644,7 +644,7 @@ ngx_http_gzip_filter_gzheader(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
static u_char gzheader[10] = static u_char gzheader[10] =
{ 0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 3 }; { 0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 3 };
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }

2
src/http/modules/ngx_http_gzip_static_module.c
View File

@ -248,7 +248,7 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
/* we need to allocate all before the header would be sent */ /* we need to allocate all before the header would be sent */
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }

6
src/http/modules/ngx_http_image_filter_module.c
View File

@ -581,7 +581,7 @@ ngx_http_image_json(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
size_t len; size_t len;
ngx_buf_t *b; ngx_buf_t *b;
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
return NULL; return NULL;
} }
@ -633,7 +633,7 @@ ngx_http_image_asis(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
{ {
ngx_buf_t *b; ngx_buf_t *b;
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
return NULL; return NULL;
} }
@ -1067,7 +1067,7 @@ transparent:
return NULL; return NULL;
} }
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
gdFree(out); gdFree(out);
return NULL; return NULL;

2
src/http/modules/ngx_http_mp4_module.c
View File

@ -636,7 +636,7 @@ ngx_http_mp4_handler(ngx_http_request_t *r)
} }
if (mp4 == NULL) { if (mp4 == NULL) {
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }

2
src/http/modules/ngx_http_static_module.c
View File

@ -233,7 +233,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
/* we need to allocate all before the header would be sent */ /* we need to allocate all before the header would be sent */
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }

2
src/http/modules/ngx_http_xslt_filter_module.c
View File

@ -584,7 +584,7 @@ ngx_http_xslt_apply_stylesheet(ngx_http_request_t *r,
return NULL; return NULL;
} }
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
ngx_free(buf); ngx_free(buf);
return NULL; return NULL;

2
src/http/ngx_http_core_module.c
View File

@ -1926,7 +1926,7 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
return ngx_http_send_header(r); return ngx_http_send_header(r);
} }
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }

2
src/http/ngx_http_file_cache.c
View File

@ -1577,7 +1577,7 @@ ngx_http_cache_send(ngx_http_request_t *r)
/* we need to allocate all before the header would be sent */ /* we need to allocate all before the header would be sent */
b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); b = ngx_calloc_buf(r->pool);
if (b == NULL) { if (b == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }