Commit 000609ae76d7e1568c0288c6498a0c16fc005fa9 - nginx

fix segfaults introduced in r2549 and r2550 Igor Sysoev 13 years ago

2 changed file(s) with 6 addition(s) and 6 deletion(s). Raw diff Collapse all Expand all

-3

src/http/ngx_http_core_module.c less more

1379	1379
1380	1380	if ((*clcfp)->captures && r->captures == NULL) {
1381	1381
1382		len = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int);
1383
1384		r->captures = ngx_palloc(r->pool, len);
	1382	len = (NGX_HTTP_MAX_CAPTURES + 1) * 3;
	1383
	1384	r->captures = ngx_palloc(r->pool, len * sizeof(int));
1385	1385	if (r->captures == NULL) {
1386	1386	return NGX_ERROR;
1387	1387	}

-3

src/http/ngx_http_request.c less more

1661	1661
1662	1662	if (sn[i].captures && r->captures == NULL) {
1663	1663
1664		ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int);
1665
1666		r->captures = ngx_palloc(r->pool, ncaptures);
	1664	ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3;
	1665
	1666	r->captures = ngx_palloc(r->pool, ncaptures * sizeof(int));
1667	1667	if (r->captures == NULL) {
1668	1668	return NGX_ERROR;
1669	1669	}