diff options
| author |   djm <djm@openbsd.org> | 2010-03-26 03:13:17 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-03-26 03:13:17 +0000 |
| commit | 3ff74d91c6cec898756ce4662d514aaeaaaaaf1e (patch) | |
| tree | b85b612d90a12a0ccad8090a1c5d02400b794780 | |
| parent | sync (diff) | |
| download | wireguard-openbsd-3ff74d91c6cec898756ce4662d514aaeaaaaaf1e.tar.xz wireguard-openbsd-3ff74d91c6cec898756ce4662d514aaeaaaaaf1e.zip | |
allow buffer_get_int_ret/buffer_get_int64_ret to take a NULL pointer
argument to allow skipping past values in a buffer
| -rw-r--r-- | usr.bin/ssh/bufaux.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/bufaux.c b/usr.bin/ssh/bufaux.c index 936e793103c..8a889611714 100644 --- a/usr.bin/ssh/bufaux.c +++ b/usr.bin/ssh/bufaux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bufaux.c,v 1.48 2010/02/02 22:49:34 djm Exp $ */ +/* $OpenBSD: bufaux.c,v 1.49 2010/03/26 03:13:17 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -82,7 +82,8 @@ buffer_get_int_ret(u_int *ret, Buffer *buffer) if (buffer_get_ret(buffer, (char *) buf, 4) == -1) return (-1); - *ret = get_u32(buf); + if (ret != NULL) + *ret = get_u32(buf); return (0); } @@ -104,7 +105,8 @@ buffer_get_int64_ret(u_int64_t *ret, Buffer *buffer) if (buffer_get_ret(buffer, (char *) buf, 8) == -1) return (-1); - *ret = get_u64(buf); + if (ret != NULL) + *ret = get_u64(buf); return (0); } |