Mercurial > hg > nginx

changeset 6138:bc47a7a8159c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed overflow detection in ngx_inet_addr(). Overflow detection of the last octet might not work. Reported by Sergey Polovko.
author Valentin Bartenev <vbart@nginx.com>
date Tue, 28 Apr 2015 18:55:03 +0300
parents 5d0c9405af71
children b19350b896bb
files src/core/ngx_inet.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -26,15 +26,15 @@ ngx_inet_addr(u_char *text, size_t len)
     n = 0;
 
     for (p = text; p < text + len; p++) {
-
-        if (octet > 255) {
-            return INADDR_NONE;
-        }
-
         c = *p;
 
         if (c >= '0' && c <= '9') {
             octet = octet * 10 + (c - '0');
+
+            if (octet > 255) {
+                return INADDR_NONE;
+            }
+
             continue;
         }