osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

smb: Certain deprecated commands never use Unicode 

MS-CIFS indicates that the deprecated commands SMB_COM_SEARCH (0x81),
SMB_COM_FIND (0x82), and SMB_COM_FIND_UNIQUE (0x83) never use
Unicode, and "names are returned in the extended ASCII (OEM)
character set only." That makes sense, as the size in the return
is listed as a fixed 13 bytes. Honor that.
This commit is contained in:
John Thacker 2022-09-24 07:08:07 -04:00
parent 44f733dfee
commit 899db5d3c0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-smb.c
View File

@ -6011,11 +6011,11 @@ dissect_search_dir_info(tvbuff_t *tvb, packet_info *pinfo,
COUNT_BYTES_SUBR(4);
/* file name */
/* XXX - [MS-CIFS] says this is 13 *bytes*, suggesting that it's
in an OEM code page (i.e., ASCII superset), not Unicode in
UTF-16 encoding. Is it *ever* Unicode? */
/* [MS-CIFS] says this is 13 *bytes*, and also says "Unicode is
not supported; names are returned in the extended ASCII
(OEM) character set only." */
fn_len = 13;
fn = get_unicode_or_ascii_string(tvb, &offset, si->unicode, &fn_len,
fn = get_unicode_or_ascii_string(tvb, &offset, FALSE/*Never Unicode*/, &fn_len,
TRUE, TRUE, bcp);
CHECK_STRING_SUBR(fn);
/* ensure that it's null-terminated */