From 3ca8b7717933e28b8bd896aab1738e937e1a3117 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 5 Jan 2007 16:24:47 +1100 Subject: - ray@cvs.openbsd.org 2006/11/23 01:35:11 [misc.c sftp.c] Don't access buf[strlen(buf) - 1] for zero-length strings. ``ok by me'' djm@. --- sftp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sftp.c') diff --git a/sftp.c b/sftp.c index a39c782f7..990b0cbbd 100644 --- a/sftp.c +++ b/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.93 2006/09/30 17:48:22 ray Exp $ */ +/* $OpenBSD: sftp.c,v 1.94 2006/11/23 01:35:11 ray Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -298,11 +298,11 @@ static char * path_append(char *p1, char *p2) { char *ret; - int len = strlen(p1) + strlen(p2) + 2; + size_t len = strlen(p1) + strlen(p2) + 2; ret = xmalloc(len); strlcpy(ret, p1, len); - if (p1[strlen(p1) - 1] != '/') + if (p1[0] != '\0' && p1[strlen(p1) - 1] != '/') strlcat(ret, "/", len); strlcat(ret, p2, len); -- cgit v1.2.3