$B2,ED$G$9!#(B
From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 00970] Re: segmentation fault with http:
Date: Wed, 28 Jun 2000 18:41:41 +0900 (JST)
$B:dK\$5$s(B> $B$D$$$G$K!"0BA4$N$?$a!"(Burl.c $B$N(B domain_match() $B$d(B check_no_proxy()
$B:dK\$5$s(B> $B$G$b(B NULL $B%A%'%C%/$r$7$F$*$$$?J}$,$$$$$+$b$7$l$^$;$s$M!#(B
$B$=$N$h$&$K$7$F$_$^$7$?!#$"$H!"(B[w3m-dev 969] $B$G$O(B non_null(pu->host) $B$r(B
$B8F$S$@$7$F$$$?$N$G$9$,!"(Bpu->host $B$,6uGr$N$_$K$J$k$3$H$O$J$$$H;W$$$^$9(B
$B$N$G!"$?$@$N(B NULL $B%A%'%C%/$KJQ99$7$^$7$?!#(B
-- Tsutomu Okada--- url.c.old Wed Jun 28 16:05:04 2000 +++ url.c Thu Jun 29 11:32:38 2000 @@ -1136,6 +1136,7 @@ pu->file = allocStr("/", 0); if (non_null(FTP_proxy) && !Do_not_use_proxy && + pu->host != NULL && !check_no_proxy(pu->host)) { sock = openSocket(FTP_proxy_parsed.host, schemetable[FTP_proxy_parsed.scheme].cmdname, @@ -1165,6 +1166,7 @@ hr.command = HR_COMMAND_HEAD; if (non_null(HTTP_proxy) && !Do_not_use_proxy && + pu->host != NULL && !check_no_proxy(pu->host)) { char *save_label; #ifdef USE_SSL @@ -1271,6 +1273,7 @@ case SCM_GOPHER: if (non_null(GOPHER_proxy) && !Do_not_use_proxy && + pu->host != NULL && !check_no_proxy(pu->host)) { sock = openSocket(GOPHER_proxy_parsed.host, schemetable[GOPHER_proxy_parsed.scheme].cmdname, @@ -1424,6 +1427,8 @@ static int domain_match(char *pat, char *domain) { + if (domain == NULL) + return 0; if (*pat == '.') pat++; for (;;) { @@ -1441,7 +1446,8 @@ { TextListItem *tl; - if (NO_proxy_domains == NULL || NO_proxy_domains->nitem == 0) + if (NO_proxy_domains == NULL || NO_proxy_domains->nitem == 0 || + domain == NULL) return 0; for (tl = NO_proxy_domains->first; tl != NULL; tl = tl->next) { if (domain_match(tl->ptr, domain))
This archive was generated by hypermail 2b29 : Wed Jul 19 2000 - 10:30:57 CDT