diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-17 18:44:48 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-17 18:44:48 +0200 |
| commit | 22bbb0ebe67bc1eb4014d399edcf03340fd6c803 (patch) | |
| tree | 28a62f0221e2c499ee108c205567033dbafa54da /source4/libcli/raw/rawtrans.c | |
| parent | c9a12fa55d63e4bccb5b453186022dae1da39032 (diff) | |
| parent | 3180cbbc5b3396da07c325166e472b143b3abe1e (diff) | |
| download | samba-22bbb0ebe67bc1eb4014d399edcf03340fd6c803.tar.gz samba-22bbb0ebe67bc1eb4014d399edcf03340fd6c803.tar.bz2 samba-22bbb0ebe67bc1eb4014d399edcf03340fd6c803.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 43fc10aaa7c3d50cb9fee5ecab859103aec4a62e)
Diffstat (limited to 'source4/libcli/raw/rawtrans.c')
| -rw-r--r-- | source4/libcli/raw/rawtrans.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/libcli/raw/rawtrans.c b/source4/libcli/raw/rawtrans.c index 29881afd2b..0f15b2151b 100644 --- a/source4/libcli/raw/rawtrans.c +++ b/source4/libcli/raw/rawtrans.c @@ -40,10 +40,10 @@ static bool raw_trans_oob(struct smbcli_request *req, ptr = req->in.hdr + offset; /* be careful with wraparound! */ - if (ptr < req->in.data || - ptr >= req->in.data + req->in.data_size || + if ((uintptr_t)ptr < (uintptr_t)req->in.data || + (uintptr_t)ptr >= (uintptr_t)req->in.data + req->in.data_size || count > req->in.data_size || - ptr + count > req->in.data + req->in.data_size) { + (uintptr_t)ptr + count > (uintptr_t)req->in.data + req->in.data_size) { return true; } return false; |