Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1802

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/1802/1

curl: fixed crashers in curl patch for system proxy

Change-Id: Ieb8e782eab9c9bde1d2099d8cc32eceef9f00002
---
M curl/curl-7.26.0_win-proxy.patch
1 file changed, 21 insertions(+), 17 deletions(-)



diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch
index 61badc7..810438f 100644
--- a/curl/curl-7.26.0_win-proxy.patch
+++ b/curl/curl-7.26.0_win-proxy.patch
@@ -52,7 +52,7 @@
  
  #ifndef CURL_DISABLE_HTTP
    /* If proxy was not specified, we check for default proxy environment
-@@ -4138,7 +4158,58 @@ static char *detect_proxy(struct connectdata *conn)
+@@ -4138,7 +4158,62 @@ static char *detect_proxy(struct connectdata *conn)
     * For compatibility, the all-uppercase versions of these variables are
     * checked if the lowercase versions don't exist.
     */
@@ -71,29 +71,33 @@
 +      ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass);
 +
 +      /* Convert the ieNoProxy into a proper no_proxy value */
-+      no_proxy = strdup(ieNoProxy);
-+      pos = strpbrk(no_proxy, "; ");
-+      while(NULL != pos) {
-+        no_proxy[pos-no_proxy] = ',';
++      if(NULL != no_proxy) {
++        no_proxy = strdup(ieNoProxy);
 +        pos = strpbrk(no_proxy, "; ");
++        while(NULL != pos) {
++          no_proxy[pos-no_proxy] = ',';
++          pos = strpbrk(no_proxy, "; ");
++        }
 +      }
 +
 +      if(!check_noproxy(conn->host.name, no_proxy)) {
 +        /* Look for the http proxy setting */
 +        char* tok;
 +
-+        tok = strtok(ieProxy, ";");
-+        if(strchr(tok, '=') == NULL) {
-+          proxy = strdup(ieProxy);
-+        }
-+        else {
-+          do {
-+            if(strncmp(tok, "http=", 5) == 0) {
-+              /* We found HTTP proxy value, then use it */
-+              proxy = strdup( tok + 5 );
-+            }
++        if (NULL != ieProxy) {
++          tok = strtok(ieProxy, ";");
++          if(strchr(tok, '=') == NULL) {
++            proxy = strdup(ieProxy);
 +          }
-+          while(NULL != strtok(NULL, ";"));
++          else {
++            do {
++              if(strncmp(tok, "http=", 5) == 0) {
++                /* We found HTTP proxy value, then use it */
++                proxy = strdup( tok + 5 );
++              }
++            }
++            while(NULL != strtok(NULL, ";"));
++          }
 +        }
 +      }
 +
@@ -112,7 +116,7 @@
    char proxy_env[128];
  
    no_proxy=curl_getenv("no_proxy");
-@@ -4189,9 +4259,9 @@ static char *detect_proxy(struct connectdata *conn)
+@@ -4189,9 +4264,9 @@ static char *detect_proxy(struct connectdata *conn)
      }
    } /* if(!check_noproxy(conn->host.name, no_proxy)) - it wasn't specified
         non-proxy */

-- 
To view, visit https://gerrit.libreoffice.org/1802
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb8e782eab9c9bde1d2099d8cc32eceef9f00002
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric <cedric.bosdonnat@free.fr>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.