diff options
| author | des <des@FreeBSD.org> | 2010-11-11 11:46:19 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2010-11-11 11:46:19 +0000 |
| commit | 59d1af232220700389c3543e93e1b1f2e2619919 (patch) | |
| tree | 6eb7398d6e807c1a0d65a65c3e0dc92c453bb592 /crypto/openssh/bufaux.c | |
| parent | ac0984a6533794998189315ced48d83ce881917d (diff) | |
| parent | a074372f88279f4eaaed8ab05de3f3fda1fac4eb (diff) | |
| download | FreeBSD-src-59d1af232220700389c3543e93e1b1f2e2619919.zip FreeBSD-src-59d1af232220700389c3543e93e1b1f2e2619919.tar.gz | |
Upgrade to OpenSSH 5.6p1.
Diffstat (limited to 'crypto/openssh/bufaux.c')
| -rw-r--r-- | crypto/openssh/bufaux.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/openssh/bufaux.c b/crypto/openssh/bufaux.c index 4ef19c4..854fd51 100644 --- a/crypto/openssh/bufaux.c +++ b/crypto/openssh/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 @@ -84,7 +84,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); } @@ -106,7 +107,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); } |
