diff options
| author | Richard Sharpe <sharpe@ns.aus.com> | 2003-12-30 04:38:20 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@ns.aus.com> | 2003-12-30 04:38:20 +0000 |
| commit | 6d24754e6a4bd9ca51064b78e1ae285f873a0b02 (patch) | |
| tree | 1badea6b1750ba25ecc81512f90eaa94861490c5 | |
| parent | b1390392a6522bb6d20ad9ebbba0317b58dd77a4 (diff) | |
A small fix from Andrew Bartlett. The Short File Name is always in UNICODE.
svn path=/trunk/; revision=9494
| -rw-r--r-- | packet-smb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-smb.c b/packet-smb.c index f976f8a3aa..bd066d4814 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.380 2003/12/28 12:43:38 ulfl Exp $ + * $Id: packet-smb.c,v 1.381 2003/12/30 04:38:20 sharpe Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -12805,8 +12805,8 @@ dissect_4_3_4_6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree_add_item(tree, hf_smb_reserved, tvb, offset, 1, TRUE); COUNT_BYTES_SUBR(1); - /* short file name */ - sfn = get_unicode_or_ascii_string(tvb, &offset, si->unicode, &sfn_len, FALSE, TRUE, bcp); + /* short file name, it is always in UNICODE, it seems */ + sfn = get_unicode_or_ascii_string(tvb, &offset, TRUE, &sfn_len, FALSE, TRUE, bcp); CHECK_STRING_SUBR(sfn); proto_tree_add_string(tree, hf_smb_short_file_name, tvb, offset, 24, sfn); |