r2381 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2008-01-23 17:27:02 +0100 (Wed, 23 Jan 2008)
New Revision: 2381

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/mgt_vcc.c
Log:
Merged revisions 2379 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2379 | des | 2008-01-23 17:23:28 +0100 (Wed, 23 Jan 2008) | 6 lines
  
  It is possible for VSS_parse() to succeed and return a NULL addr but a
  non-NULL port (e.g. ":80" which is a valid listening address).  In that
  case, port should be free()d before returning.
  
  Coverity Scan (CID:15)
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2306,2310,2313-2314,2316,2318,2320,2322,2324,2357,2359,2361,2375
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2306,2310,2313-2314,2316,2318,2320,2322,2324,2357,2359,2361,2375,2379

Modified: branches/1.1/bin/varnishd/mgt_vcc.c
===================================================================
--- branches/1.1/bin/varnishd/mgt_vcc.c	2008-01-23 16:24:30 UTC (rev 2380)
+++ branches/1.1/bin/varnishd/mgt_vcc.c	2008-01-23 16:27:02 UTC (rev 2381)
@@ -342,6 +342,14 @@
 		 * XXX: again: we should check it here in the "trivial" case.
 		 */
 		if (VSS_parse(b_arg, &addr, &port) != 0 || addr == NULL) {
+			/*
+			 * (addr == NULL && port != NULL) is possible if
+			 * the user incorrectly specified an address such
+			 * as ":80", which is a valid listening address.
+			 * In the future, we may want to interpret this as
+			 * a shortcut for "localhost:80".
+			 */
+			free(port);
 			fprintf(stderr, "invalid backend address\n");
 			return (1);
 		}