From 52870ea1e093763baea1a07c6ece2d1fb144d86d Mon Sep 17 00:00:00 2001 From: Vic Lee Date: Fri, 5 Aug 2011 22:48:36 +0800 Subject: [PATCH] Fix incorrect stream_seek_* --- include/freerdp/utils/stream.h | 6 +++--- libfreerdp-core/update.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/freerdp/utils/stream.h b/include/freerdp/utils/stream.h index a345f7528..0f0843487 100644 --- a/include/freerdp/utils/stream.h +++ b/include/freerdp/utils/stream.h @@ -130,9 +130,9 @@ void stream_extend(STREAM* stream); (((uint64)(*(_s->p + 7))) << 56); \ } while (0) -#define stream_seek_uint8(_s) stream_seek(s, 1) -#define stream_seek_uint16(_s) stream_seek(s, 2) -#define stream_seek_uint32(_s) stream_seek(s, 4) +#define stream_seek_uint8(_s) stream_seek(_s, 1) +#define stream_seek_uint16(_s) stream_seek(_s, 2) +#define stream_seek_uint32(_s) stream_seek(_s, 4) #define stream_read_uint16_be(_s, _v) do { _v = \ (((uint16)(*_s->p)) << 8) + \ diff --git a/libfreerdp-core/update.c b/libfreerdp-core/update.c index fc3f95077..76b15b7f1 100644 --- a/libfreerdp-core/update.c +++ b/libfreerdp-core/update.c @@ -117,7 +117,7 @@ void update_read_palette(rdpUpdate* update, STREAM* s, PALETTE_UPDATE* palette_u uint32 color; stream_seek_uint16(s); /* pad2Octets (2 bytes) */ - stream_seek_uint32(palette_update->number); /* numberColors (4 bytes), must be set to 256 */ + stream_read_uint32(s, palette_update->number); /* numberColors (4 bytes), must be set to 256 */ if (palette_update->number > 256) palette_update->number = 256;