From 3b14487c7e5218ff3e0ff3118ca1afd706e05247 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 16 Aug 2000 03:44:04 +0000 Subject: [PATCH] hack for unmarshalling unistr's on machines with BIG_ENDIAN arch I think we have a lot more of these bugs lurking (i'm fairly confident of it). jerry --- source/rpc_parse/parse_prs.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/source/rpc_parse/parse_prs.c b/source/rpc_parse/parse_prs.c index 469de90434e..f5a0bc642ba 100644 --- a/source/rpc_parse/parse_prs.c +++ b/source/rpc_parse/parse_prs.c @@ -626,9 +626,17 @@ BOOL prs_unistr2(BOOL charmode, char *name, prs_struct *ps, int depth, UNISTR2 * /* If we're using big-endian, reverse to get little-endian. */ if(ps->bigendian_data) - DBG_RW_PSVAL(charmode, name, depth, ps->data_offset, ps->io, ps->bigendian_data, q, p, str->uni_str_len) + { + DBG_RW_PSVAL(charmode, name, depth, ps->data_offset, + ps->io, ps->bigendian_data, q, p, + str->uni_str_len) + } else - DBG_RW_PCVAL(charmode, name, depth, ps->data_offset, ps->io, q, p, str->uni_str_len * sizeof(uint16)) + { + DBG_RW_PCVAL(charmode, name, depth, ps->data_offset, + ps->io, q, p, str->uni_str_len * sizeof(uint16)) + } + ps->data_offset += (str->uni_str_len * sizeof(uint16)); return True; @@ -762,12 +770,21 @@ BOOL prs_unistr(char *name, prs_struct *ps, int depth, UNISTR *str) p += 2; q += 2; } else { +#if WORDS_BIGENDIAN + RW_CVAL(ps->io, q+1, *p, 0); + p++; + RW_CVAL(ps->io, q, *p, 0); + p++; + q+=2; +#else RW_CVAL(ps->io, q, *p, 0); p++; q++; RW_CVAL(ps->io, q, *p, 0); p++; q++; +#endif /* WORDS_BIGENDIAN */ + } len++; -- 2.11.4.GIT