From d03f17c2dbaa8235725d6ea9d9474557fdd0f8f7 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 5 Dec 2011 13:40:51 -0500 Subject: Ignore NULL-terminator when checking UTF8-validity Glib fails if the NULL-terminator is included when a length is specified. --- src/responder/nss/nsssrv_cmd.c | 6 +++--- src/responder/pam/pamsrv_cmd.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c index 31a47210d..6848413dd 100644 --- a/src/responder/nss/nsssrv_cmd.c +++ b/src/responder/nss/nsssrv_cmd.c @@ -875,7 +875,7 @@ static int nss_cmd_getpwnam(struct cli_ctx *cctx) } /* If the body isn't valid UTF-8, fail */ - if (!sss_utf8_check(body, blen)) { + if (!sss_utf8_check(body, blen -1)) { ret = EINVAL; goto done; } @@ -2149,7 +2149,7 @@ static int nss_cmd_getgrnam(struct cli_ctx *cctx) } /* If the body isn't valid UTF-8, fail */ - if (!sss_utf8_check(body, blen)) { + if (!sss_utf8_check(body, blen -1)) { ret = EINVAL; goto done; } @@ -3196,7 +3196,7 @@ static int nss_cmd_initgroups(struct cli_ctx *cctx) } /* If the body isn't valid UTF-8, fail */ - if (!sss_utf8_check(body, blen)) { + if (!sss_utf8_check(body, blen -1)) { ret = EINVAL; goto done; } diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c index 14e807e55..c4017e608 100644 --- a/src/responder/pam/pamsrv_cmd.c +++ b/src/responder/pam/pamsrv_cmd.c @@ -71,7 +71,7 @@ static int extract_string(char **var, size_t size, uint8_t *body, size_t blen, if (str[size-1]!='\0') return EINVAL; /* If the string isn't valid UTF-8, fail */ - if (!sss_utf8_check(str, size)) { + if (!sss_utf8_check(str, size-1)) { return EINVAL; } -- cgit