diff options
| author | Damien Miller <djm@mindrot.org> | 2010-04-16 07:51:45 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-04-16 07:51:45 +0200 |
| commit | d6fc3065dab4ee42ad728070f14c0293c55fe86b (patch) | |
| tree | adcf10f8a1abef3dc73b7f1cf50361f17ec8bdbb | |
| parent | openssh-5.5p1 marker (diff) | |
| download | openssh-d6fc3065dab4ee42ad728070f14c0293c55fe86b.tar.xz openssh-d6fc3065dab4ee42ad728070f14c0293c55fe86b.zip | |
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/03/26 03:13:17
[bufaux.c]
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-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bufaux.c | 8 |
2 files changed, 10 insertions, 3 deletions
@@ -1,5 +1,10 @@ 20100416 - (djm) Release openssh-5.5p1 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/03/26 03:13:17 + [bufaux.c] + allow buffer_get_int_ret/buffer_get_int64_ret to take a NULL pointer + argument to allow skipping past values in a buffer 20100410 - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo @@ -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); } |