bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Red Hat issue 1021958: fixed a bug with faulty buffer/data length calculation in xio-ascii.c:_xiodump()

Browse source
This commit is contained in:
Gerhard Rieger 2014-03-22 20:07:20 +01:00
parent e04509da7b
commit 28bb28e7f8
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -26,6 +26,9 @@ corrections:
On big endian platforms with type long >32bit the range option applied a On big endian platforms with type long >32bit the range option applied a
bad base address. Thanks to hejia hejia for reporting and fixing this bug. bad base address. Thanks to hejia hejia for reporting and fixing this bug.
Red Hat issue 1021958: fixed a bug with faulty buffer/data length
calculation in xio-ascii.c:_xiodump()
fixed bug in xio-openssl.c that prevented error handling of bad number fixed bug in xio-openssl.c that prevented error handling of bad number
of arguments, thanks to Paulik Tamas for reporting of arguments, thanks to Paulik Tamas for reporting

12
xio-ascii.c
View file

@ -1,5 +1,5 @@
/* source: xio-ascii.c */ /* source: xio-ascii.c */
/* Copyright Gerhard Rieger 2002-2008 */ /* Copyright Gerhard Rieger */
/* Published under the GNU General Public License V.2, see file COPYING */ /* Published under the GNU General Public License V.2, see file COPYING */
/* this file contains functions for text encoding, decoding, and conversions */ /* this file contains functions for text encoding, decoding, and conversions */
@ -111,6 +111,7 @@ char *
coding specifies how the data is to be presented. Not much to select now. coding specifies how the data is to be presented. Not much to select now.
returns a pointer to the first char in codbuff that has not been overwritten; returns a pointer to the first char in codbuff that has not been overwritten;
it might also point to the first char after the buffer! it might also point to the first char after the buffer!
this function does not write a terminating \0
*/ */
static char * static char *
_xiodump(const unsigned char *data, size_t bytes, char *codbuff, size_t codlen, _xiodump(const unsigned char *data, size_t bytes, char *codbuff, size_t codlen,
@ -118,16 +119,17 @@ _xiodump(const unsigned char *data, size_t bytes, char *codbuff, size_t codlen,
int start = 1; int start = 1;
int space = coding & 0xff; int space = coding & 0xff;
if (bytes <= 0) { codbuff[0] = '\0'; return codbuff; } if (bytes <= 0) { return codbuff; }
if (codlen < 1) { return codbuff; }
if (space == 0) space = -1; if (space == 0) space = -1;
if (0) { if (0) {
; /* for canonical reasons */ ; /* for canonical reasons */
} else if (1) { } else if (1) {
/* simple hexadecimal output */ /* simple hexadecimal output */
if (bytes > 2*codlen+1) { if (3*bytes+1 > codlen) {
bytes = (codlen-1)/2; bytes = (codlen-1)/3; /* "truncate" data so generated text fits */
} }
*codbuff++ = 'x'; --codlen; *codbuff++ = 'x';
while (bytes-- > 0) { while (bytes-- > 0) {
if (start == 0 && space == 0) { if (start == 0 && space == 0) {
*codbuff++ = ' '; *codbuff++ = ' ';