more checks of function returned values when applicable

lyokha · Feb 19, 2020 · ddd924e · ddd924e
1 parent cc1aa6f
commit ddd924e
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/ngx_http_custom_counters_module.c b/ngx_http_custom_counters_module.c
@@ -1814,7 +1814,9 @@ ngx_http_cnt_write_persistent_counters(ngx_http_request_t *r,
         return NGX_ERROR;
     }
 
-    (void) ngx_http_cnt_build_collection(r, cycle, &collection, 1);
+    if (ngx_http_cnt_build_collection(r, cycle, &collection, 1) != NGX_OK) {
+        goto cleanup;
+    }
 
     if (ngx_write_file(&file, collection.data, collection.len, 0) == NGX_ERROR)
     {
@@ -1829,6 +1831,15 @@ ngx_http_cnt_write_persistent_counters(ngx_http_request_t *r,
     }
 
     return NGX_OK;
+
+cleanup:
+
+    if (ngx_close_file(file.fd) == NGX_FILE_ERROR) {
+        ngx_log_error(NGX_LOG_ERR, log, ngx_errno,
+                      ngx_close_file_n " \"%V\" failed", &file.name);
+    }
+
+    return NGX_ERROR;
 }