sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

libcli/smb: Add smb_bytes_pull_str() helper function

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Stefan Metzmacher 2016-10-25 14:50:41 +02:00 committed by Andreas Schneider
parent 7999e6f6c0
commit 5b0a54d36c
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcli/smb/smb_util.h
View File

@ -36,3 +36,6 @@ uint8_t *trans2_bytes_push_str(uint8_t *buf, bool ucs2,
size_t *pconverted_size); size_t *pconverted_size);
uint8_t *trans2_bytes_push_bytes(uint8_t *buf, uint8_t *trans2_bytes_push_bytes(uint8_t *buf,
const uint8_t *bytes, size_t num_bytes); const uint8_t *bytes, size_t num_bytes);
NTSTATUS smb_bytes_pull_str(TALLOC_CTX *mem_ctx, char **_str, bool ucs2,
const uint8_t *buf, size_t buf_len,
size_t *pbuf_consumed);

60
libcli/smb/util.c
View File

@ -315,3 +315,63 @@ uint8_t *trans2_bytes_push_bytes(uint8_t *buf,
memcpy(&buf[buflen], bytes, num_bytes); memcpy(&buf[buflen], bytes, num_bytes);
return buf; return buf;
} }
static NTSTATUS internal_bytes_pull_str(TALLOC_CTX *mem_ctx, char **_str,
bool ucs2, bool align_odd,
const uint8_t *buf, size_t buf_len,
size_t *pbuf_consumed)
{
size_t pad = 0;
char *str = NULL;
size_t str_len = 0;
bool ok;
*_str = NULL;
if (pbuf_consumed != NULL) {
*pbuf_consumed = 0;
}
if (ucs2 &&
((align_odd && (buf_len % 2 == 0)) ||
(!align_odd && (buf_len % 2 == 1)))) {
if (buf_len < 1) {
return NT_STATUS_BUFFER_TOO_SMALL;
}
pad = 1;
buf_len -= pad;
buf += pad;
}
if (ucs2) {
buf_len = utf16_len_n(buf, buf_len);
} else {
size_t tmp = strnlen((const char *)buf, buf_len);
if (tmp < buf_len) {
tmp += 1;
}
buf_len = tmp;
}
ok = convert_string_talloc(mem_ctx,
ucs2 ? CH_UTF16LE : CH_DOS,
CH_UNIX,
buf, buf_len,
&str, &str_len);
if (!ok) {
return map_nt_error_from_unix_common(errno);
}
if (pbuf_consumed != NULL) {
*pbuf_consumed = buf_len + pad;
}
*_str = str;
return NT_STATUS_OK;;
}
NTSTATUS smb_bytes_pull_str(TALLOC_CTX *mem_ctx, char **_str, bool ucs2,
const uint8_t *buf, size_t buf_len,
size_t *_buf_consumed)
{
return internal_bytes_pull_str(mem_ctx, _str, ucs2, true,
buf, buf_len, _buf_consumed);
}