commit fbb2a1c9e7e1c850965979c44535d68b24944ae2
author Ruslan Ermilov <ru@nginx.com> Tue Jul 21 20:34:29 2020 +0300
committer Ruslan Ermilov <ru@nginx.com> Tue Jul 21 20:34:29 2020 +0300
tree 10b500b00c8962f950a74a87513f47c9648c80c7
parent c454e38fc6be97859ac205352d0e1233f88ecefd

Core: close PID file when writing fails.

Reported by Jinhua Tan.

src/core/ngx_cycle.c

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 764cf46..d7479fa 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -1009,6 +1009,7 @@
 ngx_create_pidfile(ngx_str_t *name, ngx_log_t *log)
 {
     size_t      len;
+    ngx_int_t   rc;
     ngx_uint_t  create;
     ngx_file_t  file;
     u_char      pid[NGX_INT64_LEN + 2];
@@ -1033,11 +1034,13 @@
         return NGX_ERROR;
     }
 
+    rc = NGX_OK;
+
     if (!ngx_test_config) {
         len = ngx_snprintf(pid, NGX_INT64_LEN + 2, "%P%N", ngx_pid) - pid;
 
         if (ngx_write_file(&file, pid, len, 0) == NGX_ERROR) {
-            return NGX_ERROR;
+            rc = NGX_ERROR;
         }
     }
 
@@ -1046,7 +1049,7 @@
                       ngx_close_file_n " \"%s\" failed", file.name.data);
     }
 
-    return NGX_OK;
+    return rc;
 }