Merge tag '1.33.0' into packaging.

Unit 1.33.0 release.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/nxt_port_memory.c b/src/nxt_port_memory.c
index 0a4a6c53..ad6e97ad 100644
--- a/src/nxt_port_memory.c
+++ b/src/nxt_port_memory.c
@@ -393,8 +393,7 @@ nxt_shm_open(nxt_task_t *task, size_t size)
 
 #elif (NXT_HAVE_SHM_OPEN_ANON)
 
-    fd = shm_open(SHM_ANON, O_RDWR, S_IRUSR | S_IWUSR);
-
+    fd = shm_open(SHM_ANON, O_RDWR, 0600);
     if (nxt_slow_path(fd == -1)) {
         nxt_alert(task, "shm_open(SHM_ANON) failed %E", nxt_errno);
 
@@ -408,8 +407,7 @@ nxt_shm_open(nxt_task_t *task, size_t size)
     /* Just in case. */
     shm_unlink((char *) name);
 
-    fd = shm_open((char *) name, O_CREAT | O_EXCL | O_RDWR, S_IRUSR | S_IWUSR);
-
+    fd = shm_open((char *) name, O_CREAT | O_EXCL | O_RDWR, 0600);
     if (nxt_slow_path(fd == -1)) {
         nxt_alert(task, "shm_open(%s) failed %E", name, nxt_errno);
 
@@ -454,6 +452,10 @@ nxt_port_mmap_get(nxt_task_t *task, nxt_port_mmaps_t *mmaps, nxt_chunk_id_t *c,
 
     nxt_thread_mutex_lock(&mmaps->mutex);
 
+    if (nxt_slow_path(mmaps->elts == NULL)) {
+        goto end;
+    }
+
     end_port_mmap = mmaps->elts + mmaps->size;
 
     for (port_mmap = mmaps->elts;
@@ -500,6 +502,8 @@ nxt_port_mmap_get(nxt_task_t *task, nxt_port_mmaps_t *mmaps, nxt_chunk_id_t *c,
 
     /* TODO introduce port_mmap limit and release wait. */
 
+end:
+
     *c = 0;
     mmap_handler = nxt_port_new_port_mmap(task, mmaps, tracking, n);