RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-03-09 11:47:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsepol: constify tokenized input

Browse Source 
The input string to be tokenized is not modified.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Acked-by: James Carter <jwcart2@gmail.com>
This commit is contained in:
Christian Göttsche 2023-12-11 15:48:24 +01:00 committed by James Carter
parent 4d33c6753e
commit 22d3609b13
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsepol/include/sepol/policydb/util.h
View File

@ -40,7 +40,7 @@ char *sepol_extended_perms_to_string(avtab_extended_perms_t *xperms);
* The tokenize function may be used to
* replace sscanf
*/
extern int tokenize(char *line_buf, char delim, int num_args, ...);
extern int tokenize(const char *line_buf, char delim, int num_args, ...);
#ifdef __cplusplus
}

9
libsepol/src/util.c
View File

@ -221,9 +221,9 @@ err:
*/
/* Read a token from a buffer */
static inline int tokenize_str(char delim, char **str, char **ptr, size_t *len)
static inline int tokenize_str(char delim, char **str, const char **ptr, size_t *len)
{
char *tmp_buf = *ptr;
const char *tmp_buf = *ptr;
*str = NULL;
while (**ptr != '\0') {
@ -273,9 +273,10 @@ static inline int tokenize_str(char delim, char **str, char **ptr, size_t *len)
* contain the remaining content of line_buf. If the delimiter is any whitespace
* character, then all whitespace will be squashed.
*/
int tokenize(char *line_buf, char delim, int num_args, ...)
int tokenize(const char *line_buf, char delim, int num_args, ...)
{
char **arg, *buf_p;
char **arg;
const char *buf_p;
int rc, items;
size_t arg_len = 0;
va_list ap;