[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

aCaB acab at clamav.net
Sun Apr 4 01:08:40 UTC 2010


The following commit has been merged in the debian/unstable branch:
commit b7a4900cb288d19dc8bb4366414a2684429cc9bd
Author: aCaB <acab at clamav.net>
Date:   Thu Oct 29 20:51:52 2009 +0100

    win32: check for .. and . at the end of path too

diff --git a/win32/compat/w32_stat.c b/win32/compat/w32_stat.c
index fabfcee..37fdeed 100644
--- a/win32/compat/w32_stat.c
+++ b/win32/compat/w32_stat.c
@@ -75,15 +75,15 @@ wchar_t *uncpath(const char *path) {
     }
     while((stripme = wcsstr(strip_from, L"\\."))) {
 	wchar_t *copy_from, *copy_to;
-	if(stripme[2] == L'\\') {
+	if(!stripme[2] || stripme[2] == L'\\') {
 	    copy_from = &stripme[2];
 	    copy_to = stripme;
-	} else if (stripme[2] == L'.' && stripme[3] == L'\\') {
+	} else if (stripme[2] == L'.' && (!stripme[3] || stripme[3] == L'\\')) {
 	    *stripme = L'\0';
 	    copy_from = &stripme[3];
 	    copy_to = wcsrchr(strip_from, L'\\');
 	    if(!copy_to)
-		copy_to = strip_from;
+		copy_to = stripme;
 	} else {
 	    strip_from = &stripme[1];
 	    continue;

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list