[GNUnet-SVN] [gnurl] 246/254: FindWin32CACert: Use a temporary buffer on the stack

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.54.1
in repository gnurl.

commit e8fecf2614b479d2448c61159b4a7dadf4cf7df9
Author: Michael Kaufmann <address@hidden>
AuthorDate: Tue Jun 6 22:15:17 2017 +0200

    FindWin32CACert: Use a temporary buffer on the stack
    
    Don't malloc() the temporary buffer, and use the correct type:
    SearchPath() works with TCHAR, but SearchPathA() works with char.
    Set the buffer size to MAX_PATH, because the terminating null byte
    is already included in MAX_PATH.
    
    Reviewed-by: Daniel Stenberg
    Reviewed-by: Marcel Raad
    
    Closes #1548
---
 src/tool_doswin.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index 48af3bfb8..91299986a 100644
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@@ -646,24 +646,18 @@ CURLcode FindWin32CACert(struct OperationConfig *config,
   if(curlinfo->features & CURL_VERSION_SSL) {
 
     DWORD res_len;
-    DWORD buf_tchar_size = PATH_MAX + 1;
-    DWORD buf_bytes_size = sizeof(TCHAR) * buf_tchar_size;
+    char buf[PATH_MAX];
     char *ptr = NULL;
 
-    char *buf = malloc(buf_bytes_size);
-    if(!buf)
-      return CURLE_OUT_OF_MEMORY;
     buf[0] = '\0';
 
-    res_len = SearchPathA(NULL, bundle_file, NULL, buf_tchar_size, buf, &ptr);
+    res_len = SearchPathA(NULL, bundle_file, NULL, PATH_MAX, buf, &ptr);
     if(res_len > 0) {
       Curl_safefree(config->cacert);
       config->cacert = strdup(buf);
       if(!config->cacert)
         result = CURLE_OUT_OF_MEMORY;
     }
-
-    Curl_safefree(buf);
   }
 
   return result;

-- 
To stop receiving notification emails like this one, please contact
address@hidden