sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

libndr:ndr: Allow only one string encoding flag

Browse Source 
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2023-07-13 14:59:52 +12:00 committed by Andrew Bartlett
parent ce2f4ecd59
commit 5b693597b0
2 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
librpc/ndr/libndr.h
View File

@ -170,6 +170,12 @@ struct ndr_print {
LIBNDR_FLAG_STR_RAW8 | \
0)
#define LIBNDR_ENCODING_FLAGS (0U | \
LIBNDR_FLAG_STR_ASCII | \
LIBNDR_FLAG_STR_UTF8 | \
LIBNDR_FLAG_STR_RAW8 | \
0)
/*
* Mark an element as SECRET, it won't be printed by
* via ndr_print* unless NDR_PRINT_SECRETS is specified.

58
librpc/ndr/ndr_string.c
View File

@ -44,29 +44,36 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, ndr_flags_type
chset = CH_UTF16BE;
}
if (flags & LIBNDR_FLAG_STR_ASCII) {
chset = CH_DOS;
byte_mul = 1;
flags &= ~LIBNDR_FLAG_STR_ASCII;
}
/*
* We will check this flag, but from the unmodified
* ndr->flags, so just remove it from flags
*/
flags &= ~LIBNDR_FLAG_STR_NO_EMBEDDED_NUL;
if (flags & LIBNDR_FLAG_STR_UTF8) {
switch (flags & LIBNDR_ENCODING_FLAGS) {
case 0:
break;
case LIBNDR_FLAG_STR_ASCII:
chset = CH_DOS;
byte_mul = 1;
break;
case LIBNDR_FLAG_STR_UTF8:
chset = CH_UTF8;
byte_mul = 1;
flags &= ~LIBNDR_FLAG_STR_UTF8;
}
break;
if (flags & LIBNDR_FLAG_STR_RAW8) {
case LIBNDR_FLAG_STR_RAW8:
do_convert = 0;
byte_mul = 1;
flags &= ~LIBNDR_FLAG_STR_RAW8;
break;
default:
return ndr_pull_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%"PRI_LIBNDR_FLAGS"\n",
ndr->flags & LIBNDR_STRING_FLAGS);
}
flags &= ~LIBNDR_ENCODING_FLAGS;
flags &= ~LIBNDR_FLAG_STR_CONFORMANT;
if (flags & LIBNDR_FLAG_STR_CHARLEN) {
@ -260,29 +267,36 @@ _PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push *ndr, ndr_flags_type
s_len = s?strlen(s):0;
if (flags & LIBNDR_FLAG_STR_ASCII) {
chset = CH_DOS;
byte_mul = 1;
flags &= ~LIBNDR_FLAG_STR_ASCII;
}
/*
* We will check this flag, but from the unmodified
* ndr->flags, so just remove it from flags
*/
flags &= ~LIBNDR_FLAG_STR_NO_EMBEDDED_NUL;
if (flags & LIBNDR_FLAG_STR_UTF8) {
switch (flags & LIBNDR_ENCODING_FLAGS) {
case 0:
break;
case LIBNDR_FLAG_STR_ASCII:
chset = CH_DOS;
byte_mul = 1;
break;
case LIBNDR_FLAG_STR_UTF8:
chset = CH_UTF8;
byte_mul = 1;
flags &= ~LIBNDR_FLAG_STR_UTF8;
}
break;
if (flags & LIBNDR_FLAG_STR_RAW8) {
case LIBNDR_FLAG_STR_RAW8:
do_convert = 0;
byte_mul = 1;
flags &= ~LIBNDR_FLAG_STR_RAW8;
break;
default:
return ndr_push_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%"PRI_LIBNDR_FLAGS"\n",
ndr->flags & LIBNDR_STRING_FLAGS);
}
flags &= ~LIBNDR_ENCODING_FLAGS;
flags &= ~LIBNDR_FLAG_STR_CONFORMANT;