summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-03-18 01:48:11 +0000
committerJeremy Allison <jra@samba.org>2003-03-18 01:48:11 +0000
commitd332200c254b4bbf27461a37f9655bf42faa2b3a (patch)
treef749eb110346913b8cb63cb07f4616bb32288f65 /source3/libsmb
parenta8eaea53ed70ef998a510b6dcf0288462207f9a0 (diff)
downloadsamba-d332200c254b4bbf27461a37f9655bf42faa2b3a.tar.gz
samba-d332200c254b4bbf27461a37f9655bf42faa2b3a.tar.bz2
samba-d332200c254b4bbf27461a37f9655bf42faa2b3a.zip
Merge in the developer string options from HEAD. We need to ensure 3.0
is as stable as possible in the string department and some pain now will help later :-). Jeremy. (This used to be commit 86e3eddac698d90f4666b8492b4603a4efbbd67b)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/clistr.c28
1 files changed, 21 insertions, 7 deletions
diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c
index 3c9964368e..97a3fa6cc9 100644
--- a/source3/libsmb/clistr.c
+++ b/source3/libsmb/clistr.c
@@ -20,24 +20,38 @@
#include "includes.h"
-int clistr_push(struct cli_state *cli, void *dest, const char *src, int dest_len, int flags)
+size_t clistr_push_fn(const char *function, unsigned int line,
+ struct cli_state *cli, void *dest,
+ const char *src, int dest_len, int flags)
{
- return push_string(cli->outbuf, dest, src, dest_len, flags);
+ size_t buf_used = PTR_DIFF(dest, cli->outbuf);
+ if (dest_len == -1) {
+ if (((ptrdiff_t)dest < (ptrdiff_t)cli->outbuf) || (buf_used > cli->bufsize)) {
+ DEBUG(0, ("Pushing string of 'unlimited' length into non-SMB buffer!\n"));
+ return push_string_fn(function, line, cli->outbuf, dest, src, -1, flags);
+ }
+ return push_string_fn(function, line, cli->outbuf, dest, src, cli->bufsize - buf_used, flags);
+ }
+
+ /* 'normal' push into size-specified buffer */
+ return push_string_fn(function, line, cli->outbuf, dest, src, dest_len, flags);
}
-int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len, int src_len,
- int flags)
+size_t clistr_pull_fn(const char *function, unsigned int line,
+ struct cli_state *cli, char *dest, const void *src,
+ int dest_len, int src_len,
+ int flags)
{
- return pull_string(cli->inbuf, dest, src, dest_len, src_len, flags);
+ return pull_string_fn(function, line, cli->inbuf, dest, src, dest_len, src_len, flags);
}
-int clistr_align_out(struct cli_state *cli, const void *p, int flags)
+size_t clistr_align_out(struct cli_state *cli, const void *p, int flags)
{
return align_string(cli->outbuf, p, flags);
}
-int clistr_align_in(struct cli_state *cli, const void *p, int flags)
+size_t clistr_align_in(struct cli_state *cli, const void *p, int flags)
{
return align_string(cli->inbuf, p, flags);
}