From: Pierre Joye Date: Tue, 3 Nov 2009 10:48:12 +0000 (+0000) Subject: - fix lenght for alloc and cpy (Kanwal) X-Git-Tag: php-5.4.0alpha1~191^2~2439 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=431292c42157c662ec122d1bb3a6ea59e1d67156;p=php - fix lenght for alloc and cpy (Kanwal) --- diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 49541e8d75..f0638d70dc 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -111,7 +111,7 @@ char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC) char *bucket_key = NULL; if (!pSid) { - bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname)); + bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + 1); if (!bucket_key) { return NULL; } @@ -123,14 +123,14 @@ char * tsrm_win32_get_path_sid_key(const char *pathname TSRMLS_DC) return NULL; } - bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + strlen(ptcSid)); + bucket_key = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(pathname) + strlen(ptcSid) + 1); if (!bucket_key) { LocalFree(ptcSid); return NULL; } memcpy(bucket_key, ptcSid, strlen(ptcSid)); - memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname)); + memcpy(bucket_key + strlen(ptcSid), pathname, strlen(pathname) + 1); LocalFree(ptcSid); return bucket_key;