moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-15 14:05:03 -05:00
Code Issues Releases Wiki Activity

cookies: make use of string duplication function

Browse Source 
strstore() is defined as a strdup which ensures to free the target
pointer before duping the source char * into it. Make use of it in
two more cases where it can simplify the code.
This commit is contained in:
Daniel Gustafsson 2021-03-12 17:36:08 +01:00 committed by Daniel Stenberg
parent 54bd65cabd
commit 98888e6070
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cookie.c
View File

@ -105,6 +105,8 @@ Example set of cookies:
#include "curl_memory.h" #include "curl_memory.h"
#include "memdebug.h" #include "memdebug.h"
static void strstore(char **str, const char *newstr);
static void freecookie(struct Cookie *co) static void freecookie(struct Cookie *co)
{ {
free(co->expirestr); free(co->expirestr);
@ -197,8 +199,7 @@ static bool pathmatch(const char *cookie_path, const char *request_uri)
/* #-fragments are already cut off! */ /* #-fragments are already cut off! */
if(0 == strlen(uri_path) || uri_path[0] != '/') { if(0 == strlen(uri_path) || uri_path[0] != '/') {
free(uri_path); strstore(&uri_path, "/");
uri_path = strdup("/");
if(!uri_path) if(!uri_path)
return FALSE; return FALSE;
} }
@ -333,8 +334,7 @@ static char *sanitize_cookie_path(const char *cookie_path)
/* RFC6265 5.2.4 The Path Attribute */ /* RFC6265 5.2.4 The Path Attribute */
if(new_path[0] != '/') { if(new_path[0] != '/') {
/* Let cookie-path be the default-path. */ /* Let cookie-path be the default-path. */
free(new_path); strstore(&new_path, "/");
new_path = strdup("/");
return new_path; return new_path;
} }