Added hardening compiler flags in the spec file.

[platform/upstream/curl.git] / src / tool_cfgable.c

diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index 818d7f4..f00a0d1 100644 (file)
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@@ -5,11 +5,11 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
  *
  * You may opt to use, copy, modify, merge, publish, distribute and/or sell
  * copies of the Software, and permit persons to whom the Software is
@@ -26,24 +26,25 @@
 
 #include "memdebug.h" /* keep this as LAST include */
 
-void config_init(struct Configurable* config)
+void config_init(struct OperationConfig* config)
 {
-  memset(config, 0, sizeof(struct Configurable));
+  memset(config, 0, sizeof(struct OperationConfig));
 
-  config->errors = stderr; /* default errors to stderr */
   config->postfieldsize = -1;
-  config->showerror = -1; /* will show errors */
   config->use_httpget = FALSE;
   config->create_dirs = FALSE;
   config->maxredirs = DEFAULT_MAXREDIRS;
   config->proto = CURLPROTO_ALL; /* FIXME: better to read from library */
   config->proto_present = FALSE;
-  config->proto_redir =
-    CURLPROTO_ALL & ~(CURLPROTO_FILE|CURLPROTO_SCP); /* not FILE or SCP */
+  config->proto_redir = CURLPROTO_ALL & /* All except FILE, SCP and SMB */
+                        ~(CURLPROTO_FILE | CURLPROTO_SCP | CURLPROTO_SMB |
+                          CURLPROTO_SMBS);
   config->proto_redir_present = FALSE;
+  config->proto_default = NULL;
+  config->tcp_nodelay = TRUE; /* enabled by default */
 }
 
-static void free_config_fields(struct Configurable *config)
+static void free_config_fields(struct OperationConfig *config)
 {
   struct getout *urlnode;
 
@@ -67,6 +68,9 @@ static void free_config_fields(struct Configurable *config)
   Curl_safefree(config->tls_username);
   Curl_safefree(config->tls_password);
   Curl_safefree(config->tls_authtype);
+  Curl_safefree(config->proxy_tls_username);
+  Curl_safefree(config->proxy_tls_password);
+  Curl_safefree(config->proxy_tls_authtype);
   Curl_safefree(config->proxyuserpwd);
   Curl_safefree(config->proxy);
 
@@ -98,39 +102,43 @@ static void free_config_fields(struct Configurable *config)
   config->url_out = NULL;
 
   Curl_safefree(config->cipher_list);
+  Curl_safefree(config->proxy_cipher_list);
   Curl_safefree(config->cert);
+  Curl_safefree(config->proxy_cert);
   Curl_safefree(config->cert_type);
+  Curl_safefree(config->proxy_cert_type);
   Curl_safefree(config->cacert);
+  Curl_safefree(config->proxy_cacert);
   Curl_safefree(config->capath);
+  Curl_safefree(config->proxy_capath);
   Curl_safefree(config->crlfile);
+  Curl_safefree(config->pinnedpubkey);
+  Curl_safefree(config->proxy_crlfile);
   Curl_safefree(config->key);
+  Curl_safefree(config->proxy_key);
   Curl_safefree(config->key_type);
+  Curl_safefree(config->proxy_key_type);
   Curl_safefree(config->key_passwd);
+  Curl_safefree(config->proxy_key_passwd);
   Curl_safefree(config->pubkey);
   Curl_safefree(config->hostpubmd5);
   Curl_safefree(config->engine);
 
   Curl_safefree(config->customrequest);
   Curl_safefree(config->krblevel);
-  Curl_safefree(config->trace_dump);
 
-  Curl_safefree(config->xoauth2_bearer);
-
-  if(config->trace_fopened && config->trace_stream)
-    fclose(config->trace_stream);
-  config->trace_stream = NULL;
+  Curl_safefree(config->oauth_bearer);
 
+  Curl_safefree(config->unix_socket_path);
   Curl_safefree(config->writeout);
-
-  if(config->errors_fopened && config->errors)
-    fclose(config->errors);
-  config->errors = NULL;
+  Curl_safefree(config->proto_default);
 
   curl_slist_free_all(config->quote);
   curl_slist_free_all(config->postquote);
   curl_slist_free_all(config->prequote);
 
   curl_slist_free_all(config->headers);
+  curl_slist_free_all(config->proxyheaders);
 
   if(config->httppost) {
     curl_formfree(config->httppost);
@@ -140,33 +148,27 @@ static void free_config_fields(struct Configurable *config)
 
   curl_slist_free_all(config->telnet_options);
   curl_slist_free_all(config->resolve);
+  curl_slist_free_all(config->connect_to);
 
-  Curl_safefree(config->socksproxy);
-  Curl_safefree(config->socks5_gssapi_service);
+  Curl_safefree(config->preproxy);
+  Curl_safefree(config->proxy_service_name);
+  Curl_safefree(config->service_name);
 
   Curl_safefree(config->ftp_account);
   Curl_safefree(config->ftp_alternative_to_user);
-
-  Curl_safefree(config->libcurl);
 }
 
-void config_free(struct Configurable *config)
+void config_free(struct OperationConfig *config)
 {
-  struct Configurable *last = config;
-
-  /* Find the last config structure */
-  while(last->next)
-    last = last->next;
+  struct OperationConfig *last = config;
 
   /* Free each of the structures in reverse order */
-  do {
-    struct Configurable *prev = last->prev;
-    if(prev)
-      last->easy = NULL;
+  while(last) {
+    struct OperationConfig *prev = last->prev;
 
     free_config_fields(last);
     free(last);
 
     last = prev;
-  } while(last);
+  }
 }