- (djm) OpenBSD CVS Sync

   - markus@cvs.openbsd.org 2003/03/05 22:33:43
     [channels.c monitor.c scp.c session.c sftp-client.c sftp-int.c]
     [sftp-server.c ssh-add.c sshconnect2.c]
     fix memory leaks; from dlheine@suif.Stanford.EDU/CLOUSEAU; ok djm@

1 files changed, 6 insertions, 4 deletions

diff --git a/sftp-server.c b/sftp-server.c
index 4eb31d94e..0c00003f8 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.39 2003/02/06 09:29:18 markus Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.40 2003/03/05 22:33:43 markus Exp $");
 
 #include "buffer.h"
 #include "bufaux.h"
@@ -158,7 +158,7 @@ handle_new(int use, char *name, int fd, DIR *dirp)
                         handles[i].use = use;
                         handles[i].dirp = dirp;
                         handles[i].fd = fd;
-                        handles[i].name = name;
+                        handles[i].name = xstrdup(name);
                         return i;
                 }
         }
@@ -230,9 +230,11 @@ handle_close(int handle)
         if (handle_is_ok(handle, HANDLE_FILE)) {
                 ret = close(handles[handle].fd);
                 handles[handle].use = HANDLE_UNUSED;
+                xfree(handles[handle].name);
         } else if (handle_is_ok(handle, HANDLE_DIR)) {
                 ret = closedir(handles[handle].dirp);
                 handles[handle].use = HANDLE_UNUSED;
+                xfree(handles[handle].name);
         } else {
                 errno = ENOENT;
         }
@@ -396,7 +398,7 @@ process_open(void)
         if (fd < 0) {
                 status = errno_to_portable(errno);
         } else {
-                handle = handle_new(HANDLE_FILE, xstrdup(name), fd, NULL);
+                handle = handle_new(HANDLE_FILE, name, fd, NULL);
                 if (handle < 0) {
                         close(fd);
                 } else {
@@ -681,7 +683,7 @@ process_opendir(void)
         if (dirp == NULL) {
                 status = errno_to_portable(errno);
         } else {
-                handle = handle_new(HANDLE_DIR, xstrdup(path), 0, dirp);
+                handle = handle_new(HANDLE_DIR, path, 0, dirp);
                 if (handle < 0) {
                         closedir(dirp);
                 } else {