summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2011-02-28 12:05:31 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2011-02-28 12:05:31 +0000
commit503589272556fe9c8b582c7c1b56fcefcd42bbc5 (patch)
treee6e17d85630ce997ec597fb2a2e238372da60df4
parentf2c4bb42f053065517ff491e2caa14561e060895 (diff)
downloadzsh-503589272556fe9c8b582c7c1b56fcefcd42bbc5.tar.gz
zsh-503589272556fe9c8b582c7c1b56fcefcd42bbc5.tar.xz
zsh-503589272556fe9c8b582c7c1b56fcefcd42bbc5.zip
Frank, 28812 as modified in 28813:
fix allocation of wide array in wcs_ztrdup()
-rw-r--r--ChangeLog8
-rw-r--r--Src/string.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 13964dcea..95e709e8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-28  Peter Stephenson  <pws@csr.com>
+
+	* Frank, 28812, modified as in 28813: Src/string.c: wcs_ztrdup()
+	needs to allocate array of wchar_t.  Looks like this isn't
+	currently used anywhere.
+
 2011-02-27  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* Nikolai Weibull: 28649,28804: Completion/Unix/Command/_git:
@@ -14264,5 +14270,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5209 $
+* $Revision: 1.5210 $
 *****************************************************
diff --git a/Src/string.c b/Src/string.c
index 2bd1baea3..04e7446c9 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;
 }