mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-11 04:12:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: ngx_regex_compile() error handling fixes.

Browse Source 
Now we actually return NGX_ERROR on errors, and provide an error
string for memory allocation errors.

Reported by Markus Linnala.
This commit is contained in:
Maxim Dounin 2014-09-08 21:35:53 +04:00
parent 2af7181b3b
commit c5bee22d16
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/ngx_regex.c
View File

@ -149,7 +149,7 @@ ngx_regex_compile(ngx_regex_compile_t *rc)
rc->regex = ngx_pcalloc(rc->pool, sizeof(ngx_regex_t));
if (rc->regex == NULL) {
return NGX_ERROR;
goto nomem;
}
rc->regex->code = re;
@ -159,7 +159,7 @@ ngx_regex_compile(ngx_regex_compile_t *rc)
if (ngx_pcre_studies != NULL) {
elt = ngx_list_push(ngx_pcre_studies);
if (elt == NULL) {
return NGX_ERROR;
goto nomem;
}
elt->regex = rc->regex;
@ -204,7 +204,15 @@ failed:
rc->err.len = ngx_snprintf(rc->err.data, rc->err.len, p, &rc->pattern, n)
- rc->err.data;
return NGX_OK;
return NGX_ERROR;
nomem:
rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
"regex \"%V\" compilation failed: no memory",
&rc->pattern)
- rc->err.data;
return NGX_ERROR;
}