From 841da548c9a4891165affb1a6658cb577091a23c Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sun, 3 Mar 2002 16:33:22 +0000 Subject: [PATCH] updates. --- CHANGES | 6 ++++++ lib/silcutil/silcbuffmt.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CHANGES b/CHANGES index cc9ce437..0f8488b6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +Sun Mar 3 18:37:13 EET 2002 Pekka Riikonen + + * Fixed the buffer formatting and unformatting routines to + check the size of 64 bits types with sizeof(). Affected + file is lib/silcutil/silcbuffmt.c. + Mon Feb 25 17:19:05 EET 2002 Pekka Riikonen * Removed 0.6.x backwards support. diff --git a/lib/silcutil/silcbuffmt.c b/lib/silcutil/silcbuffmt.c index be83be57..191206b9 100644 --- a/lib/silcutil/silcbuffmt.c +++ b/lib/silcutil/silcbuffmt.c @@ -120,20 +120,20 @@ int silc_buffer_format_vp(SilcBuffer dst, va_list ap) { unsigned char xf[8]; SilcInt64 x = va_arg(ap, SilcInt64); - HAS_SPACE(dst, 8); + HAS_SPACE(dst, sizeof(SilcInt64)); SILC_PUT64_MSB(x, xf); - silc_buffer_put(dst, xf, 8); - silc_buffer_pull(dst, 8); + silc_buffer_put(dst, xf, sizeof(SilcInt64)); + silc_buffer_pull(dst, sizeof(SilcInt64)); break; } case SILC_BUFFER_PARAM_UI64_INT: { unsigned char xf[8]; SilcUInt64 x = va_arg(ap, SilcUInt64); - HAS_SPACE(dst, 8); + HAS_SPACE(dst, sizeof(SilcUInt64)); SILC_PUT64_MSB(x, xf); - silc_buffer_put(dst, xf, 8); - silc_buffer_pull(dst, 8); + silc_buffer_put(dst, xf, sizeof(SilcUInt64)); + silc_buffer_pull(dst, sizeof(SilcUInt64)); break; } case SILC_BUFFER_PARAM_UI8_STRING: @@ -273,19 +273,19 @@ int silc_buffer_unformat_vp(SilcBuffer src, va_list ap) case SILC_BUFFER_PARAM_SI64_INT: { SilcInt64 *x = va_arg(ap, SilcInt64 *); - HAS_SPACE(src, 8); + HAS_SPACE(src, sizeof(SilcInt64)); if (x) SILC_GET64_MSB(*x, src->data); - silc_buffer_pull(src, 8); + silc_buffer_pull(src, sizeof(SilcInt64)); break; } case SILC_BUFFER_PARAM_UI64_INT: { SilcUInt64 *x = va_arg(ap, SilcUInt64 *); - HAS_SPACE(src, 8); + HAS_SPACE(src, sizeof(SilcUInt64)); if (x) SILC_GET64_MSB(*x, src->data); - silc_buffer_pull(src, 8); + silc_buffer_pull(src, sizeof(SilcUInt64)); break; } case SILC_BUFFER_PARAM_UI8_STRING: -- 2.24.0