From c33495ca9cf1bb12ac5bc3263458fdf3331c1f89 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sun, 9 Sep 2001 17:32:03 +0000 Subject: 2001-08-31 Marcus Brinkmann * file-get-translator.c (netfs_S_file_get_translator): If asprintf() fails, set ERR to errno. * dir-lookup.c (netfs_S_dir_lookup): Catch if asprintf() fails and return ENOMEM. If netfs_make_protid() fails, set ERROR to errno, not ENOMEM. Do this before freeing USER. * dir-mkfile.c (netfs_S_dir_mkfile): If netfs_make_protid() fails, set ERROR to errno and free USER. * file-exec.c (netfs_S_file_exec): Likewise. Reported by Igor Khavkine . --- libnetfs/file-exec.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'libnetfs/file-exec.c') diff --git a/libnetfs/file-exec.c b/libnetfs/file-exec.c index 4f9e5034..9839c694 100644 --- a/libnetfs/file-exec.c +++ b/libnetfs/file-exec.c @@ -130,16 +130,25 @@ netfs_S_file_exec (struct protid *cred, { newpi = netfs_make_protid (netfs_make_peropen (np, O_READ, cred->po), user); - right = ports_get_send_right (newpi); - err = exec_exec (_netfs_exec, - right, MACH_MSG_TYPE_COPY_SEND, - task, flags, argv, argvlen, envp, envplen, - fds, MACH_MSG_TYPE_COPY_SEND, fdslen, - portarray, MACH_MSG_TYPE_COPY_SEND, portarraylen, - intarray, intarraylen, deallocnames, deallocnameslen, - destroynames, destroynameslen); - mach_port_deallocate (mach_task_self (), right); - ports_port_deref (newpi); + if (newpi) + { + right = ports_get_send_right (newpi); + err = exec_exec (_netfs_exec, + right, MACH_MSG_TYPE_COPY_SEND, + task, flags, argv, argvlen, envp, envplen, + fds, MACH_MSG_TYPE_COPY_SEND, fdslen, + portarray, MACH_MSG_TYPE_COPY_SEND, portarraylen, + intarray, intarraylen, + deallocnames, deallocnameslen, + destroynames, destroynameslen); + mach_port_deallocate (mach_task_self (), right); + ports_port_deref (newpi); + } + else + { + err = errno; + iohelp_free_iouser (user); + } } } -- cgit v1.2.3