summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2011-12-05 13:40:51 -0500
committerStephen Gallagher <sgallagh@redhat.com>2011-12-05 14:24:18 -0500
commitd22a6b9feb74bd630ab25dd6c32da6ae88b4fc33 (patch)
tree2e58319b3c219056f103b6fdb470d9884c6e2c12 /src
parentd4d9091f705da146d549c31b62ebf21e863fbfcf (diff)
downloadsssd-d22a6b9feb74bd630ab25dd6c32da6ae88b4fc33.tar.gz
sssd-d22a6b9feb74bd630ab25dd6c32da6ae88b4fc33.tar.xz
sssd-d22a6b9feb74bd630ab25dd6c32da6ae88b4fc33.zip
Ignore NULL-terminator when checking UTF8-validity
Glib fails if the NULL-terminator is included when a length is specified.
Diffstat (limited to 'src')
-rw-r--r--src/responder/nss/nsssrv_cmd.c6
-rw-r--r--src/responder/pam/pamsrv_cmd.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c
index fcfacb737..8e40bd2e1 100644
--- a/src/responder/nss/nsssrv_cmd.c
+++ b/src/responder/nss/nsssrv_cmd.c
@@ -912,7 +912,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;
}
@@ -2199,7 +2199,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;
}
@@ -3257,7 +3257,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 2a000f095..40df755d6 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;
}