From: Pekka Riikonen Date: Sat, 23 Feb 2008 13:40:58 +0000 (+0200) Subject: Fixed silc_buffer_unformat return correct length with SILC_STR_ADVANCE X-Git-Tag: 1.2.beta2~14 X-Git-Url: http://git.silcnet.org/gitweb/?p=runtime.git;a=commitdiff_plain;h=ccdddda33bec54d464d667dbf05fb2307e8a7e87 Fixed silc_buffer_unformat return correct length with SILC_STR_ADVANCE --- diff --git a/lib/silcutil/silcbuffmt.c b/lib/silcutil/silcbuffmt.c index 944841d4..838177d1 100644 --- a/lib/silcutil/silcbuffmt.c +++ b/lib/silcutil/silcbuffmt.c @@ -1244,11 +1244,12 @@ int silc_buffer_sunformat_vp_i(SilcStack stack, SilcBuffer src, va_list ap, return -1; ok: + len = src->data - start_ptr; + /* Push the buffer back to the start. */ - if (process && !advance) { - len = src->data - start_ptr; + if (process && !advance) silc_buffer_push(src, len); - } + return len; }