=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/bufaux.c,v retrieving revision 1.21 retrieving revision 1.24 diff -u -r1.21 -r1.24 --- src/usr.bin/ssh/Attic/bufaux.c 2001/12/28 14:13:13 1.21 +++ src/usr.bin/ssh/Attic/bufaux.c 2002/03/26 15:23:40 1.24 @@ -37,7 +37,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: bufaux.c,v 1.21 2001/12/28 14:13:13 markus Exp $"); +RCSID("$OpenBSD: bufaux.c,v 1.24 2002/03/26 15:23:40 markus Exp $"); #include #include "bufaux.h" @@ -90,7 +90,7 @@ bytes = (bits + 7) / 8; if (buffer_len(buffer) < bytes) fatal("buffer_get_bignum: input buffer too small"); - bin = (u_char *) buffer_ptr(buffer); + bin = buffer_ptr(buffer); BN_bin2bn(bin, bytes, value); buffer_consume(buffer, bytes); } @@ -133,7 +133,7 @@ { /**XXX should be two's-complement */ int len; - u_char *bin = (u_char *)buffer_get_string(buffer, (u_int *)&len); + u_char *bin = buffer_get_string(buffer, (u_int *)&len); BN_bin2bn(bin, len, value); xfree(bin); } @@ -192,7 +192,7 @@ /* Get the length. */ len = buffer_get_int(buffer); if (len > 256 * 1024) - fatal("Received packet with bad string length %d", len); + fatal("buffer_get_string: bad string length %d", len); /* Allocate space for the string. Add one byte for a null character. */ value = xmalloc(len + 1); /* Get the string. */ @@ -217,6 +217,8 @@ void buffer_put_cstring(Buffer *buffer, const char *s) { + if (s == NULL) + fatal("buffer_put_cstring: s == NULL"); buffer_put_string(buffer, s, strlen(s)); }