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/smbd | |
| 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/smbd')
| -rw-r--r-- | source3/smbd/message.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/message.c b/source3/smbd/message.c index 233848d2d6..88f833e468 100644 --- a/source3/smbd/message.c +++ b/source3/smbd/message.c @@ -64,7 +64,7 @@ static void msg_deliver(void) * Incoming message is in DOS codepage format. Convert to UNIX. */ - if ((len = convert_string_allocate(CH_DOS, CH_UNIX, msgbuf, msgpos, (void **) &msg)) < 0 || !msg) { + if ((len = convert_string_allocate(NULL,CH_DOS, CH_UNIX, msgbuf, msgpos, (void **) &msg)) < 0 || !msg) { DEBUG(3,("Conversion failed, delivering message in DOS codepage format\n")); for (i = 0; i < msgpos;) { if (msgbuf[i] == '\r' && i < (msgpos-1) && msgbuf[i+1] == '\n') { |