Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

PATCH: Fix multibyte memory allocation in `wcs_ztrdup()'



This was spotted by Thorsten Glaser from the mirbsd project.

`zalloc()' uses malloc(3) to allocate memory. wcslen(3) returns the
number of multibyte *characters* in a given string (N). The destination
string will have to be able to store N+1 wchar_ts, not N+1 bytes.

Regards, Frank
---
 Src/string.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Src/string.c b/Src/string.c
index 2bd1bae..4d74aa0 100644
--- a/Src/string.c
+++ b/Src/string.c
@@ -64,7 +64,7 @@ wcs_ztrdup(const wchar_t *s)
 
     if (!s)
 	return NULL;
-    t = (wchar_t *)zalloc(wcslen((wchar_t *)s) + 1);
+    t = (wchar_t *)zalloc(sizeof(wchar_t) * wcslen((wchar_t *)s) + 1);
     wcscpy(t, s);
     return t;
 }
-- 
1.7.4.rc1.7.g2cf08



Messages sorted by: Reverse Date, Date, Thread, Author