summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-09-20 12:42:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:30:55 -0500
commit2bb7ebdcb737fa621f8935680d28504f1ea38252 (patch)
treea0c599c445fa0e1bf32037b6e5538c624d293776 /source3
parentc6fab069024dee15502a2b527c45a10a689eaedf (diff)
downloadsamba-2bb7ebdcb737fa621f8935680d28504f1ea38252.tar.gz
samba-2bb7ebdcb737fa621f8935680d28504f1ea38252.tar.bz2
samba-2bb7ebdcb737fa621f8935680d28504f1ea38252.zip
r25258: Fix a panic message and remove superfluous return after the call to smb_panic().
Michael (This used to be commit 8b5c34b7d141c44d65622f44f9432723230cea47)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/charcnv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index c3493dc9dc..f6b9e06ec2 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -1409,8 +1409,7 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_
if (dest_len == (size_t)-1) {
/* No longer allow dest_len of -1. */
- smb_panic("push_utf8 - invalid dest_len of -1");
- return 0;
+ smb_panic("pull_ucs2 - invalid dest_len of -1");
}
if (ucs2_align(base_ptr, src, flags)) {