r1363 - trunk/varnish-cache/bin/varnishncsa

[des at projects.linpro.no]

Author: des
Date: 2007-04-22 15:09:59 +0200 (Sun, 22 Apr 2007)
New Revision: 1363

Modified:
   trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
Log:
Further eliminate fixed-size buffers.


Modified: trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/varnishncsa.c	2007-04-21 21:48:56 UTC (rev 1362)
+++ trunk/varnish-cache/bin/varnishncsa/varnishncsa.c	2007-04-22 13:09:59 UTC (rev 1363)
@@ -85,8 +85,10 @@
 	char *df_s;			/* %s, Status */
 	char *df_u;			/* %u, Remote user */
 	int bogus;			/* bogus request */
-} *ll[65536];
+} **ll;
 
+static size_t nll;
+
 static int
 isprefix(const char *str, const char *prefix, const char *end, const char **next)
 {
@@ -170,10 +172,8 @@
 	FILE *fo;
 	time_t t;
 	long l;
-	unsigned lu;
 	struct tm tm;
 	char tbuf[40];
-	char rubuf[128];
 	struct logline *lp;
 
 	end = ptr + len;
@@ -181,6 +181,18 @@
 	if (!(spec &VSL_S_CLIENT))
 		return (0);
 
+	if (fd >= nll) {
+		struct logline **newll = ll;
+		size_t newnll = nll;
+
+		while (fd >= newnll)
+			newnll += newnll + 1;
+		newll = realloc(newll, newnll * sizeof *newll);
+		assert(newll != NULL);
+		memset(newll + nll, 0, (newnll - nll) * sizeof *newll);
+		ll = newll;
+		nll = newnll;
+	}
 	if (ll[fd] == NULL) {
 		ll[fd] = calloc(sizeof *ll[fd], 1);
 		assert(ll[fd] != NULL);
@@ -265,13 +277,19 @@
 
 		/* %u: decode authorization string */
 		if (lp->df_u != NULL) {
+			char *rubuf;
+			size_t len;
+
 			base64_init();
-			lu = sizeof rubuf;
-			base64_decode(rubuf, lu, lp->df_u);
+			len = ((strlen(lp->df_u) + 3) * 4) / 3;
+			rubuf = malloc(len);
+			assert(rubuf != NULL);
+			base64_decode(rubuf, len, lp->df_u);
 			q = strchr(rubuf, ':');
 			if (q != NULL)
 				*q = '\0';
 			fprintf(fo, "%s ", rubuf);
+			free(rubuf);
 		} else {
 			fprintf(fo, "- ");
 		}