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

Add a strlen_m_term() function for returning the length of a string

Browse Source 
including the termination.  Using value(strlen_m((r->name)+1)*2) gives
the wrong answer for the NULL string.
This commit is contained in:
Tim Potter 0001-01-01 00:00:00 +00:00
parent d8d17be290
commit 7ae329e663
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/lib/util_str.c
View File

@ -1091,6 +1091,21 @@ size_t strlen_m(const char *s)
return count + strlen_w(tmpbuf);
}
/**
Work out the number of multibyte chars in a string, including the NULL
terminator.
**/
size_t strlen_m_term(const char *s)
{
size_t count = 0;
if (!s) {
return 0;
}
return strlen_m(s) + 1;
}
/**
Convert a string to upper case.
**/

4
source/librpc/idl/winreg.idl
View File

@ -10,8 +10,8 @@
] interface winreg
{
typedef struct {
[value(2*(strlen_m(r->name)+1))] uint16 name_len;
[value(r->name_len)] uint16 name_size;
[value(strlen_m_term(r->name)*2)] uint16 name_len;
[value(r->name_len)] uint16 name_size;
unistr *name;
} winreg_String;