From: Michal Privoznik Date: Wed, 29 May 2024 07:24:44 +0000 (+0200) Subject: log_cleaner: Detect rotated filenames properly X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a57195e79efc9208fa4bc55439b9b798d2e3de50;p=libvirt.git log_cleaner: Detect rotated filenames properly When removing rotated log files, their name is matched against a regex (@log_regex) and if they contain '.N' suffix the 'N' is then parsed into an integer. Well, due to a bug in virLogCleanerParseFilename() this is not how the code works. If the suffix isn't found then g_match_info_fetch() returns an empty string instead of NULL which then makes str2int parsing fail. Just check for this case before parsing the string. Based on the original patch sent by David. Reported-by: David Negreira Signed-off-by: Michal Privoznik Reviewed-by: Jiri Denemark --- diff --git a/src/logging/log_cleaner.c b/src/logging/log_cleaner.c index 4ee91843aa..4efcbc18e4 100644 --- a/src/logging/log_cleaner.c +++ b/src/logging/log_cleaner.c @@ -82,10 +82,8 @@ virLogCleanerParseFilename(const char *path, *rotated_index = 0; rotated_index_str = g_match_info_fetch(matchInfo, 3); - if (!rotated_index_str) - return chain_prefix; - - if (virStrToLong_i(rotated_index_str, NULL, 10, rotated_index) < 0) { + if (rotated_index_str && STRNEQ(rotated_index_str, "") && + virStrToLong_i(rotated_index_str, NULL, 10, rotated_index) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse rotated index from '%1$s'"), rotated_index_str);