circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-06 08:57:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-08-22 08:37:26 +01:00
parent b13005e802 1370791734
commit f4c0fe2ede
13 changed files with 174 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
file.c
View File

@ -361,7 +361,7 @@ file_read(struct client *c, const char *path, client_file_cb cb, void *cbdata)
size_t msglen;
int fd = -1;
u_int stream = file_next_stream++;
FILE *f;
FILE *f = NULL;
size_t size;
char buffer[BUFSIZ];
@ -401,7 +401,6 @@ file_read(struct client *c, const char *path, client_file_cb cb, void *cbdata)
cf->error = EIO;
goto done;
}
fclose(f);
goto done;
}
@ -424,6 +423,8 @@ skip:
return cf;
done:
if (f != NULL)
fclose(f);
file_fire_done(cf);
return NULL;
}