From be523f1fe7c136c3fca06ae9c96aff44a22482ba Mon Sep 17 00:00:00 2001
From: Pete Batard <pbatard@gmail.com>
Date: Fri, 6 Aug 2010 21:56:04 -0600
Subject: [PATCH] Windows: fix string copy in sanitize_path

The NULL byte was not being copied.
---
 libusb/os/windows_usb.c | 2 +-
 libusb/os/windows_usb.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index 14c2d7b..210a1fe 100644
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -239,7 +239,7 @@ static char* sanitize_path(const char* path)
 	if ((ret_path = (char*)calloc(size, 1)) == NULL)
 		return NULL;
 
-	safe_strncpy(&ret_path[add_root], size-add_root, path, strlen(path));
+	safe_strcpy(&ret_path[add_root], size-add_root, path);
 
 	// Ensure consistancy with root prefix
 	for (j=0; j<root_size; j++)
diff --git a/libusb/os/windows_usb.h b/libusb/os/windows_usb.h
index 8639b70..1a40ad7 100644
--- a/libusb/os/windows_usb.h
+++ b/libusb/os/windows_usb.h
@@ -67,8 +67,10 @@ extern char *_strdup(const char *strSource);
 #endif
 #define safe_free(p) do {if (p != NULL) {free(p); p = NULL;}} while(0)
 #define safe_closehandle(h) do {if (h != INVALID_HANDLE_VALUE) {CloseHandle(h); h = INVALID_HANDLE_VALUE;}} while(0)
-#define safe_strncpy(dst, dst_max, src, count) strncpy(dst, src, min(count, dst_max - 1))
-#define safe_strcpy(dst, dst_max, src) safe_strncpy(dst, dst_max, src, strlen(src)+1)
+#define safe_min(a, b) min((size_t)(a), (size_t)(b))
+#define safe_strcp(dst, dst_max, src, count) do {memcpy(dst, src, safe_min(count, dst_max)); \
+	((char*)dst)[safe_min(count, dst_max)-1] = 0;} while(0)
+#define safe_strcpy(dst, dst_max, src) safe_strcp(dst, dst_max, src, safe_strlen(src)+1)
 #define safe_strncat(dst, dst_max, src, count) strncat(dst, src, min(count, dst_max - strlen(dst) - 1))
 #define safe_strcat(dst, dst_max, src) safe_strncat(dst, dst_max, src, strlen(src)+1)
 #define safe_strcmp(str1, str2) strcmp(((str1==NULL)?"<NULL>":str1), ((str2==NULL)?"<NULL>":str2))
-- 
2.7.4