Restore umask in file descriptor server after creating the socket. Fi…

…xes issue 3661
gnachman · Jul 8, 2015 · ee23c36 · ee23c36
1 parent 841d3c5
commit ee23c36
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/sources/iTermFileDescriptorServer.c b/sources/iTermFileDescriptorServer.c
@@ -159,7 +159,7 @@ int iTermFileDescriptorServerSocketBindListen(const char *path) {
     }
 
     // Mask off all permissions for group and other. Only user can use this socket.
-    umask(S_IRWXG | S_IRWXO);
+    mode_t oldMask = umask(S_IRWXG | S_IRWXO);
 
     struct sockaddr_un local;
     local.sun_family = AF_UNIX;
@@ -168,13 +168,16 @@ int iTermFileDescriptorServerSocketBindListen(const char *path) {
     int len = strlen(local.sun_path) + sizeof(local.sun_family) + 1;
     if (bind(socketFd, (struct sockaddr *)&local, len) == -1) {
         syslog(LOG_NOTICE, "bind() failed: %s", strerror(errno));
+        umask(oldMask);
         return -1;
     }
 
     if (listen(socketFd, kMaxConnections) == -1) {
         syslog(LOG_NOTICE, "listen() failed: %s", strerror(errno));
+        umask(oldMask);
         return -1;
     }
+    umask(oldMask);
     return socketFd;
 }