diff options
author | Jeremy Allison <jra@samba.org> | 2001-07-02 00:33:15 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2001-07-02 00:33:15 +0000 |
commit | 15c64199cb29e2fca6ee7353673dbb3f962e0e24 (patch) | |
tree | c95b1b1dc0181031ef12b9eaf3f79636d7f4412f /source/libsmb/clistr.c | |
parent | db36ed1d80fcbee16d0a0b5f226e56961f3bf1ec (diff) | |
download | samba-15c64199cb29e2fca6ee7353673dbb3f962e0e24.tar.gz |
Insure caught the fact that PTRDIFFs were being done between two unrelated
pointers.
Jeremy.
Diffstat (limited to 'source/libsmb/clistr.c')
-rw-r--r-- | source/libsmb/clistr.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/source/libsmb/clistr.c b/source/libsmb/clistr.c index 762a24c22ca..6dd3b751b48 100644 --- a/source/libsmb/clistr.c +++ b/source/libsmb/clistr.c @@ -50,7 +50,7 @@ int clistr_push(struct cli_state *cli, void *dest, const char *src, int dest_len dest_len = sizeof(pstring); } - if (clistr_align(cli, dest, flags)) { + if (clistr_align_out(cli, dest, flags)) { *(char *)dest = 0; dest = (void *)((char *)dest + 1); dest_len--; @@ -101,7 +101,7 @@ int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len dest_len = sizeof(pstring); } - if (clistr_align(cli, src, flags)) { + if (clistr_align_in(cli, src, flags)) { src = (const void *)((const char *)src + 1); if (src_len > 0) src_len--; } @@ -146,8 +146,20 @@ return an alignment of either 0 or 1 if unicode is not negotiated then return 0 otherwise return 1 if offset is off ****************************************************************************/ -int clistr_align(struct cli_state *cli, const void *p, int flags) +static int clistr_align(struct cli_state *cli, char *buf, const void *p, int flags) { if ((flags & STR_NOALIGN) || !UNICODE_FLAG(cli, flags)) return 0; - return PTR_DIFF(p, cli->outbuf) & 1; + return PTR_DIFF(p, buf) & 1; } + +int clistr_align_out(struct cli_state *cli, const void *p, int flags) +{ + return clistr_align(cli, cli->outbuf, p, flags); +} + +int clistr_align_in(struct cli_state *cli, const void *p, int flags) +{ + return clistr_align(cli, cli->inbuf, p, flags); +} + + |