diff options
Diffstat (limited to 'src/label_support.c')
-rw-r--r-- | src/label_support.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/src/label_support.c b/src/label_support.c index b3ab8ab..e226d51 100644 --- a/src/label_support.c +++ b/src/label_support.c @@ -8,6 +8,7 @@ #include <stdarg.h> #include <ctype.h> #include <string.h> +#include <errno.h> #include "label_internal.h" /* @@ -16,8 +17,16 @@ * property services now use these. */ -/* Read an entry from a spec file (e.g. file_contexts) */ -static inline int read_spec_entry(char **entry, char **ptr, int *len) +/* + * Read an entry from a spec file (e.g. file_contexts) + * entry - Buffer to allocate for the entry. + * ptr - current location of the line to be processed. + * returns - 0 on success and *entry is set to be a null + * terminated value. On Error it returns -1 and + errno will be set. + * + */ +static inline int read_spec_entry(char **entry, char **ptr, int *len, const char **errbuf) { *entry = NULL; char *tmp_buf = NULL; @@ -29,6 +38,11 @@ static inline int read_spec_entry(char **entry, char **ptr, int *len) *len = 0; while (!isspace(**ptr) && **ptr != '\0') { + if (!isascii(**ptr)) { + errno = EINVAL; + *errbuf = "Non-ASCII characters found"; + return -1; + } (*ptr)++; (*len)++; } @@ -44,18 +58,23 @@ static inline int read_spec_entry(char **entry, char **ptr, int *len) /* * line_buf - Buffer containing the spec entries . + * errbuf - Double pointer used for passing back specific error messages. * num_args - The number of spec parameter entries to process. * ... - A 'char **spec_entry' for each parameter. - * returns - The number of items processed. + * returns - The number of items processed. On error, it returns -1 with errno + * set and may set errbuf to a specific error message. * * This function calls read_spec_entry() to do the actual string processing. + * As such, can return anything from that function as well. */ -int hidden read_spec_entries(char *line_buf, int num_args, ...) +int hidden read_spec_entries(char *line_buf, const char **errbuf, int num_args, ...) { char **spec_entry, *buf_p; int len, rc, items, entry_len = 0; va_list ap; + *errbuf = NULL; + len = strlen(line_buf); if (line_buf[len - 1] == '\n') line_buf[len - 1] = '\0'; @@ -85,7 +104,7 @@ int hidden read_spec_entries(char *line_buf, int num_args, ...) return items; } - rc = read_spec_entry(spec_entry, &buf_p, &entry_len); + rc = read_spec_entry(spec_entry, &buf_p, &entry_len, errbuf); if (rc < 0) { va_end(ap); return rc; |