http: compression: Set the temporary file name in n_h_c_c_s_r()

When creating a new nxt_file_t structure in
nxt_http_comp_compress_static_response() for the temporary compressed
file be sure to set the *name* member.

We don't generally need it, but I failed to notice that when calling
nxt_file_close() if the close(2) fails then we log an error message
containing the file name, which at best would have just printed junk.

So set the file name for this particular error case...

This issue was reported by coverity.

Signed-off-by: Andrew Clayton <[email protected]>

Author: ac000

src/nxt_http_compression.c

@@ -232,14 +232,12 @@ nxt_http_comp_compress_app_response(nxt_task_t *task, nxt_http_request_t *r,
 
 
 nxt_int_t
-nxt_http_comp_compress_static_response(nxt_task_t *task, nxt_file_t **f,
-                                       nxt_file_info_t *fi,
-                                       size_t static_buf_len,
-                                       size_t *out_total)
+nxt_http_comp_compress_static_response(nxt_task_t *task, nxt_http_request_t *r,
+                                       nxt_file_t **f, nxt_file_info_t *fi,
+                                       size_t static_buf_len, size_t *out_total)
 {
-    char           tmp_path[NXT_MAX_PATH_LEN];
     size_t         in_size, out_size, rest;
-    u_char         *p;
+    char           *tmp_path, *p;
     uint8_t        *in, *out;
     nxt_int_t      ret;
     nxt_file_t     tfile;
@@ -249,13 +247,14 @@ nxt_http_comp_compress_static_response(nxt_task_t *task, nxt_file_t **f,
 
     *out_total = 0;
 
-    if (nxt_slow_path(strlen(rt->tmp) + 1 + strlen(template) + 1
-                      > NXT_MAX_PATH_LEN))
-    {
+    tmp_path = nxt_mp_nget(r->mem_pool,
+                           strlen(rt->tmp) + 1 + strlen(template) + 1);
+    if (nxt_slow_path(tmp_path == NULL)) {
         return NXT_ERROR;
     }
 
-    p = nxt_cpymem(tmp_path, rt->tmp, strlen(rt->tmp));
+    p = tmp_path;
+    p = nxt_cpymem(p, rt->tmp, strlen(rt->tmp));
     *p++ = '/';
     p = nxt_cpymem(p, template, strlen(template));
     *p = '\0';
@@ -266,6 +265,7 @@ nxt_http_comp_compress_static_response(nxt_task_t *task, nxt_file_t **f,
         return NXT_ERROR;
     }
     unlink(tmp_path);
+    tfile.name = (nxt_file_name_t *)tmp_path;
 
     in_size = nxt_file_size(fi);
     out_size = nxt_http_comp_bound(in_size);

src/nxt_http_compression.h

@@ -93,8 +93,8 @@ extern const nxt_http_comp_operations_t  nxt_http_comp_brotli_ops;
 extern nxt_int_t nxt_http_comp_compress_app_response(nxt_task_t *task,
     nxt_http_request_t *r, nxt_buf_t **b);
 extern nxt_int_t nxt_http_comp_compress_static_response(nxt_task_t *task,
-    nxt_file_t **f, nxt_file_info_t *fi, size_t static_buf_len,
-    size_t *out_total);
+    nxt_http_request_t *r, nxt_file_t **f, nxt_file_info_t *fi,
+    size_t static_buf_len, size_t *out_total);
 extern bool nxt_http_comp_wants_compression(void);
 extern bool nxt_http_comp_compressor_is_valid(const nxt_str_t *token);
 extern nxt_int_t nxt_http_comp_check_compression(nxt_task_t *task,

src/nxt_http_static.c

@@ -593,7 +593,7 @@ nxt_http_static_send(nxt_task_t *task, nxt_http_request_t *r,
                 nxt_int_t  ret;
 
                 ret = nxt_http_comp_compress_static_response(
-                                                    task, &f, &fi,
+                                                    task, r, &f, &fi,
                                                     NXT_HTTP_STATIC_BUF_SIZE,
                                                     &out_total);
                 if (ret == NXT_ERROR) {