X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fstrings.c;h=778aea349c1a8b920b4a1a13f4b11e8adb9e9219;hb=09cf74a339670daeb2e841cdf26082e086ff5fa9;hp=d7dc392af4ad3fb7e6fcd775e95ffbbaa31c794d;hpb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;p=libguestfs.git diff --git a/daemon/strings.c b/daemon/strings.c index d7dc392..778aea3 100644 --- a/daemon/strings.c +++ b/daemon/strings.c @@ -33,6 +33,12 @@ do_strings_e (const char *encoding, const char *path) char *out, *err; char **lines; + if (strlen (encoding) != 1 || + strchr ("sSblBL", encoding[0]) == NULL) { + reply_with_error ("%s: invalid encoding", encoding); + return NULL; + } + buf = sysroot_path (path); if (!buf) { reply_with_perror ("malloc"); @@ -42,7 +48,7 @@ do_strings_e (const char *encoding, const char *path) r = command (&out, &err, "strings", "-e", encoding, buf, NULL); free (buf); if (r == -1) { - reply_with_error ("strings: %s: %s", path, err); + reply_with_error ("%s: %s", path, err); free (err); free (out); return NULL;