diff options
| author | Jeremy Allison <jra@samba.org> | 2003-08-20 22:06:19 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-08-20 22:06:19 +0000 |
| commit | ecddae8bf012c6b9dc4e99c788c14adde64baba8 (patch) | |
| tree | c3ed9d3a4ea5da72502e9c1c9b6b4417604b386e /source3/libsmb | |
| parent | 873f925a51d30fbfd351467999fae850f7e61110 (diff) | |
| download | samba-ecddae8bf012c6b9dc4e99c788c14adde64baba8.tar.gz samba-ecddae8bf012c6b9dc4e99c788c14adde64baba8.tar.bz2 samba-ecddae8bf012c6b9dc4e99c788c14adde64baba8.zip | |
Attempt to fix the charcnv issues causing nmbd to crash. If we get a failed
conversion simply copy as is. Also fixed the horrid malloc-twice-copy code
in the convert alloc path.
Jeremy.
(This used to be commit cfde7477fd12caef943a9422b52174438092a135)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/climessage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c index 8ce8416487..035088212c 100644 --- a/source3/libsmb/climessage.c +++ b/source3/libsmb/climessage.c @@ -87,7 +87,7 @@ int cli_message_text_build(struct cli_state *cli, char *msg, int len, int grp) p = smb_buf(cli->outbuf); *p++ = 1; - if ((lendos = convert_string_allocate(CH_UNIX, CH_DOS, msg,len, (void **) &msgdos)) < 0 || !msgdos) { + if ((lendos = convert_string_allocate(NULL,CH_UNIX, CH_DOS, msg,len, (void **) &msgdos)) < 0 || !msgdos) { DEBUG(3,("Conversion failed, sending message in UNIX charset\n")); SSVAL(p, 0, len); p += 2; memcpy(p, msg, len); |