From: Maxim Dounin <mdounin@mdounin.ru>
Date: Tue, 22 Apr 2014 10:02:45 +0000 (+0400)
Subject: SSL: added explicit check for ngx_strlchr() result.
X-Git-Tag: release-1.7.0~4
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=0fd4f76e68a28cac43574c232b3e3a52418bd446;p=nginx.git

SSL: added explicit check for ngx_strlchr() result.
---

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 1d2d1efd9..f885a5c7f 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -2637,6 +2637,11 @@ ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *pattern)
 
         end = s + slen;
         s = ngx_strlchr(s, end, '.');
+
+        if (s == NULL) {
+            return NGX_ERROR;
+        }
+
         slen = end - s;
 
         if (plen == slen && ngx_strncasecmp(s, p, plen) == 0) {