]> git.kaiwu.me - nginx.git/commitdiff
Resolver: fixed possible memory leak in ngx_resolver_create().
authorMaxim Dounin <mdounin@mdounin.ru>
Mon, 6 Aug 2012 10:48:09 +0000 (10:48 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Mon, 6 Aug 2012 10:48:09 +0000 (10:48 +0000)
Found by Coverity.

src/core/ngx_resolver.c

index 3e75e05a37896266f1bda8e6f014996e9145a0df..178e0831d56177c6cf073f849c992a1a3371bcbb 100644 (file)
@@ -113,15 +113,6 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
         return NULL;
     }
 
-    if (n) {
-        if (ngx_array_init(&r->udp_connections, cf->pool, n,
-                           sizeof(ngx_udp_connection_t))
-            != NGX_OK)
-        {
-            return NULL;
-        }
-    }
-
     cln->data = r;
 
     r->event = ngx_calloc(sizeof(ngx_event_t), cf->log);
@@ -153,6 +144,15 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
     r->log = &cf->cycle->new_log;
     r->log_level = NGX_LOG_ERR;
 
+    if (n) {
+        if (ngx_array_init(&r->udp_connections, cf->pool, n,
+                           sizeof(ngx_udp_connection_t))
+            != NGX_OK)
+        {
+            return NULL;
+        }
+    }
+
     for (i = 0; i < n; i++) {
         if (ngx_strncmp(names[i].data, "valid=", 6) == 0) {
             s.len = names[i].len - 6;