Attachment 868125 Details for Bug 1212684

[patch] possible fix

libxenstat-parseNetDevLine-iface.patch (text/plain), 1.59 KB, created by Jan Beulich on 2023-07-10 15:17:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beulich

Created: 2023-07-10 15:17:23 UTC

Size: 1.59 KB

patch

obsolete

>libxenstat/Linux: pass nul-terminated string to strpbrk()
>
>While what "tmp" points to has been cleared at the end of the first
>iteration of parseNetDevLine()'s main loop, this is too late for the
>first iteration's invocation of strpbrk() (copying the interface name).
>Properly nul-terminate the string at population time instead, removing
>the late clearing.
>
>While there also eliminate a confusing (because of being wrong) comment:
>A regex parsing error would be handled one further scope outwards. Here
>we're dealing with field 1 vs any of the later fields.
>
>Signed-off-by: Jan Beulich <jbeulich@suse.com>
>---
>Of course the function leaves much to be desired.
>
>--- unstable.orig/tools/libs/stat/xenstat_linux.c	2023-03-29 23:24:12.000000000 +0200
>+++ unstable/tools/libs/stat/xenstat_linux.c	2023-07-10 17:09:40.626970282 +0200
>@@ -169,6 +169,7 @@ static int parseNetDevLine(char *line, c
> 							matches[i].rm_so + 1) * sizeof(char));
> 				for (x = matches[i].rm_so; x < matches[i].rm_eo; x++)
> 					tmp[x - matches[i].rm_so] = line[x];
>+				tmp[x - matches[i].rm_so] = 0;
> 
> 				/* We populate all the fields from /proc/net/dev line */
> 				if (i > 1) {
>@@ -225,15 +226,11 @@ static int parseNetDevLine(char *line, c
> 							break;
> 					}
> 				}
>-				else
>-				/* There were errors when parsing this directly in RE. strpbrk() helps */
>-				if (iface != NULL) {
>+				else if (iface != NULL) {
> 					char *tmp2 = strpbrk(tmp, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
> 					if (tmp2 != NULL)
> 						strcpy(iface, tmp2);
> 				}
>-
>-				memset(tmp, 0, matches[i].rm_eo - matches[i].rm_so);
> 			}
> 		}
> 	}

Actions: View | Diff

Attachments on bug 1212684: 868125