From: Maxim Dounin <mdounin@mdounin.ru>
Date: Tue, 25 May 2021 12:17:43 +0000 (+0300)
Subject: Resolver: reworked ngx_resolver_copy() copy loop.
X-Git-Tag: release-1.21.0~3
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=f1dd1d50e090b32a765295daea5f167f1077d706;p=nginx.git

Resolver: reworked ngx_resolver_copy() copy loop.

To make the code easier to read, reworked the ngx_resolver_copy()
copy loop to match the one used to calculate length.  No functional
changes.
---

diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 12dab09ea..0d7fd7915 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -4008,15 +4008,18 @@ done:
 
     name->data = dst;
 
-    n = *src++;
-
     for ( ;; ) {
+        n = *src++;
+
+        if (n == 0) {
+            name->len = dst - name->data;
+            return NGX_OK;
+        }
+
         if (n & 0xc0) {
             n = ((n & 0x3f) << 8) + *src;
             src = &buf[n];
 
-            n = *src++;
-
         } else {
             if (dst != name->data) {
                 *dst++ = '.';
@@ -4025,13 +4028,6 @@ done:
             ngx_strlow(dst, src, n);
             dst += n;
             src += n;
-
-            n = *src++;
-        }
-
-        if (n == 0) {
-            name->len = dst - name->data;
-            return NGX_OK;
         }
     }
 }