Skip to content

Commit b4f52f0

Browse files
derrickstoleegitster
authored andcommitted
compat/win32: correct for incorrect compiler warning
The 'win build' job of our CI build is failing with the following error: compat/win32/syslog.c: In function 'syslog': compat/win32/syslog.c:53:17: error: pointer 'pos' may be used after \ 'realloc' [-Werror=use-after-free] 53 | memmove(pos + 2, pos + 1, strlen(pos)); CC compat/poll/poll.o | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compat/win32/syslog.c:47:23: note: call to 'realloc' here 47 | str = realloc(str, st_add(++str_len, 1)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ However, between this realloc() and the use we have a line that resets the value of 'pos'. Thus, this error is incorrect. It is likely due to a new version of the compiler on the CI machines. Instead of waiting for a new compiler, create a new variable to avoid this error. Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent bbea4dc commit b4f52f0

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

compat/win32/syslog.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,17 @@ void syslog(int priority, const char *fmt, ...)
4444

4545
while ((pos = strstr(str, "%1")) != NULL) {
4646
size_t offset = pos - str;
47+
char *new_pos;
4748
char *oldstr = str;
4849
str = realloc(str, st_add(++str_len, 1));
4950
if (!str) {
5051
free(oldstr);
5152
warning_errno("realloc failed");
5253
return;
5354
}
54-
pos = str + offset;
55-
memmove(pos + 2, pos + 1, strlen(pos));
56-
pos[1] = ' ';
55+
new_pos = str + offset;
56+
memmove(new_pos + 2, new_pos + 1, strlen(new_pos));
57+
new_pos[1] = ' ';
5758
}
5859

5960
switch (priority) {

0 commit comments

Comments
 (0)