From: Ian Jackson Date: Mon, 5 Aug 2013 10:45:50 +0000 (+0100) Subject: site: Initialise st->scratch with SETUP_BUFFER_LEN space. X-Git-Tag: debian/0.3.0_beta3~2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=8aaaa63461faf2cd29b3e012710fcdc8717b2ea9;hp=663d9d5f6a65ed00b66260c7dbc0881975c86521 site: Initialise st->scratch with SETUP_BUFFER_LEN space. Otherwise, if we're unlucky, we end up trying to construt a PROD packet before we have ever used buffer_copy on scratch, which causes an assertion failure ("buf->size <= buf->len - amount" at util.c:257). Reported-by: Simon Tatham Signed-off-by: Ian Jackson --- diff --git a/debian/changelog b/debian/changelog index ea1d421..9c75165 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +secnet (0.3.0~beta3) unstable; urgency=low + + * New upstream version. + - Stability bugfix: properly initialise site's scratch buffer. + + -- + secnet (0.3.0~beta2) unstable; urgency=low * New upstream version. diff --git a/site.c b/site.c index 0b39232..324a206 100644 --- a/site.c +++ b/site.c @@ -1808,7 +1808,7 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context, buffer_new(&st->buffer,SETUP_BUFFER_LEN); - buffer_new(&st->scratch,0); + buffer_new(&st->scratch,SETUP_BUFFER_LEN); BUF_ALLOC(&st->scratch,"site:scratch"); /* We are interested in poll(), but only for timeouts. We don't have