From b47280df5b28d3b2b98c3b7783441a5640569ddb Mon Sep 17 00:00:00 2001 From: Kirill Date: Sun, 27 Jan 2008 11:44:06 -0800 Subject: [PATCH] Fix unterminated string when providing a help string. --- menu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/menu.c b/menu.c index e561563..bcad14c 100644 --- a/menu.c +++ b/menu.c @@ -182,8 +182,11 @@ static STDMETHODIMP get_command_string(void *p, UINT id, if (flags & GCS_HELPTEXT) { LPCTSTR text = _T("Launch the GIT Gui in the local or chosen directory."); - LPWSTR tw = malloc((strlen(text)+1)*sizeof(wchar_t)); - mbstowcs(tw, text, strlen(text)); + size_t len = strlen(text) + 1; + LPWSTR tw = malloc(len * sizeof(wchar_t)); + /* need to convert terminating NULL as well */ + mbstowcs(tw, text, len); + /* use Win32 lstrcpyn to [automatically] avoid buffer overflow */ if (flags & GCS_UNICODE) lstrcpynW((LPWSTR)name, tw, size); else -- 2.11.4.GIT