From d8193b7af1aaedc2cfa052249f645a6fc71bb8de Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Thu, 17 Apr 2025 19:46:23 +0200 Subject: [PATCH] xmllint: Fix parsing of --pretty argument --- xmllint.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmllint.c b/xmllint.c index fb82ec54e..a6d5ee021 100644 --- a/xmllint.c +++ b/xmllint.c @@ -2893,7 +2893,6 @@ xmllintParseOptions(xmllintState *lint, int argc, const char **argv) { fprintf(errStream, "maxmem: missing integer value\n"); return(XMLLINT_ERR_UNCLASS); } - errno = 0; lint->maxmem = parseInteger(errStream, "maxmem", argv[i], 0, INT_MAX); } else if ((!strcmp(argv[i], "-debug")) || @@ -3084,8 +3083,12 @@ xmllintParseOptions(xmllintState *lint, int argc, const char **argv) { } else if ((!strcmp(argv[i], "-pretty")) || (!strcmp(argv[i], "--pretty"))) { i++; - if (argv[i] != NULL) - lint->format = atoi(argv[i]); + if (i >= argc) { + fprintf(errStream, "pretty: missing integer value\n"); + return(XMLLINT_ERR_UNCLASS); + } + lint->format = parseInteger(errStream, "pretty", argv[i], + 0, 2); #ifdef LIBXML_ZLIB_ENABLED } else if ((!strcmp(argv[i], "-compress")) || (!strcmp(argv[i], "--compress"))) {