Merge branch 'cx/fetch-display-ubfix'

gitster · gitster · commit a1b15cc9d17d · 2026-03-04T10:53:02.000-08:00
Undefined-behaviour fix in "git fetch".

* cx/fetch-display-ubfix:
  fetch: fix wrong evaluation order in URL trailing-slash trimming
diff --git a/builtin/fetch.c b/builtin/fetch.c
@@ -721,7 +721,7 @@ static void display_state_init(struct display_state *display_state, struct ref *
 		display_state->url = xstrdup("foreign");
 
 	display_state->url_len = strlen(display_state->url);
-	for (i = display_state->url_len - 1; display_state->url[i] == '/' && 0 <= i; i--)
+	for (i = display_state->url_len - 1; 0 <= i && display_state->url[i] == '/'; i--)
 		;
 	display_state->url_len = i + 1;
 	if (4 < i && !strncmp(".git", display_state->url + i - 3, 4))

Original file line number	Diff line number	Diff line change
`@@ -721,7 +721,7 @@ static void display_state_init(struct display_state display_state, struct ref `
`721`	`721`	`display_state->url = xstrdup("foreign");`
`722`	`722`
`723`	`723`	`display_state->url_len = strlen(display_state->url);`
`724`		`- for (i = display_state->url_len - 1; display_state->url[i] == '/' && 0 <= i; i--)`
	`724`	`+ for (i = display_state->url_len - 1; 0 <= i && display_state->url[i] == '/'; i--)`
`725`	`725`	`;`
`726`	`726`	`display_state->url_len = i + 1;`
`727`	`727`	`if (4 < i && !strncmp(".git", display_state->url + i - 3, 4))`