summaryrefslogtreecommitdiff
path: root/src/core/ngx_string.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-04-06 10:42:59 +0000
committerJonathan Kolb <jon@b0g.us>2009-04-06 10:42:59 +0000
commit44efb7b809acb211fd4cdea1c7b0691a1d4f09e5 (patch)
treeacdcfa68321d274122cd36d4ac0dd2bae80e4603 /src/core/ngx_string.c
parentdacca6459d00cc5a6558df79b20a54873b3cdc38 (diff)
downloadnginx-0.7.49.tar.gz
Changes with nginx 0.7.49 06 Apr 2009v0.7.49
*) Change: a segmentation fault might occur in worker process, if the $arg_... variables were used; the bug had appeared in 0.7.48.
Diffstat (limited to 'src/core/ngx_string.c')
-rw-r--r--src/core/ngx_string.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index fbde1c2ce..8f2a17159 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -703,6 +703,10 @@ ngx_strlcasestrn(u_char *s1, u_char *last, u_char *s2, size_t n)
{
ngx_uint_t c1, c2;
+ if (s1 <= last) {
+ return NULL;
+ }
+
c2 = (ngx_uint_t) *s2++;
c2 = (c2 >= 'A' && c2 <= 'Z') ? (c2 | 0x20) : c2;
last -= n;