- djm@cvs.openbsd.org 2010/01/28 00:21:18

[openssh.git] / bufaux.c

diff --git a/bufaux.c b/bufaux.c
index f033639940de17266c107532ed2f5614d071f717..e17f001e1c86a11a1d21b50483b16b074d0170a1 100644 (file)
--- a/bufaux.c
+++ b/bufaux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bufaux.c,v 1.45 2008/05/08 06:59:01 markus Exp $ */
+/* $OpenBSD: bufaux.c,v 1.47 2010/01/12 01:36:08 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -180,7 +180,7 @@ buffer_get_string_ret(Buffer *buffer, u_int *length_ptr)
                return (NULL);
        }
        /* Append a null character to make processing easier. */
-       value[len] = 0;
+       value[len] = '\0';
        /* Optionally return the length of the string. */
        if (length_ptr)
                *length_ptr = len;
@@ -198,14 +198,17 @@ buffer_get_string(Buffer *buffer, u_int *length_ptr)
 }
 
 void *
-buffer_get_string_ptr(Buffer *buffer, u_int *length_ptr)
+buffer_get_string_ptr_ret(Buffer *buffer, u_int *length_ptr)
 {
        void *ptr;
        u_int len;
 
-       len = buffer_get_int(buffer);
-       if (len > 256 * 1024)
-               fatal("buffer_get_string_ptr: bad string length %u", len);
+       if (buffer_get_int_ret(&len, buffer) != 0)
+               return NULL;
+       if (len > 256 * 1024) {
+               error("buffer_get_string_ptr: bad string length %u", len);
+               return NULL;
+       }
        ptr = buffer_ptr(buffer);
        buffer_consume(buffer, len);
        if (length_ptr)
@@ -213,6 +216,16 @@ buffer_get_string_ptr(Buffer *buffer, u_int *length_ptr)
        return (ptr);
 }
 
+void *
+buffer_get_string_ptr(Buffer *buffer, u_int *length_ptr)
+{
+       void *ret;
+
+       if ((ret = buffer_get_string_ptr_ret(buffer, length_ptr)) == NULL)
+               fatal("buffer_get_string_ptr: buffer error");
+       return (ret);
+}
+
 /*
  * Stores and arbitrary binary string in the buffer.
  */