diff options
| author | Jeremy Allison <jra@samba.org> | 2006-03-14 17:21:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:27 -0500 |
| commit | e6676a9a6928deb03c2a43a66c1245dd05d03e71 (patch) | |
| tree | 25f31eac683ccd1082cae2dd37dc9d511000fa67 /source3/lib/util_unistr.c | |
| parent | be738dd31dace66f53558b64d6f67828204650aa (diff) | |
| download | samba-e6676a9a6928deb03c2a43a66c1245dd05d03e71.tar.gz samba-e6676a9a6928deb03c2a43a66c1245dd05d03e71.tar.bz2 samba-e6676a9a6928deb03c2a43a66c1245dd05d03e71.zip | |
r14387: Try and fix the coverity issues (#53, #54) with negative
sink by ensuring all uses of rpcstr_push are consistent
with a size_t dest size arg.
Jeremy.
(This used to be commit f65d7afe1977d9d85046732842f9643716c15088)
Diffstat (limited to 'source3/lib/util_unistr.c')
| -rw-r--r-- | source3/lib/util_unistr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c index 892782b181..9713c0ccb7 100644 --- a/source3/lib/util_unistr.c +++ b/source3/lib/util_unistr.c @@ -229,7 +229,7 @@ void init_valid_table(void) null termination if applied ********************************************************************/ -size_t dos_PutUniCode(char *dst,const char *src, ssize_t len, BOOL null_terminate) +size_t dos_PutUniCode(char *dst,const char *src, size_t len, BOOL null_terminate) { int flags = null_terminate ? STR_UNICODE|STR_NOALIGN|STR_TERMINATE : STR_UNICODE|STR_NOALIGN; @@ -308,7 +308,7 @@ char *rpcstr_pull_unistr2_talloc(TALLOC_CTX *mem_ctx, const UNISTR2 *src) /* Converts a string from internal samba format to unicode */ -int rpcstr_push(void* dest, const char *src, int dest_len, int flags) +int rpcstr_push(void* dest, const char *src, size_t dest_len, int flags) { return push_ucs2(NULL, dest, src, dest_len, flags|STR_UNICODE|STR_NOALIGN); } |