From 5cabacfb591dc9b5be0e73df11d898eadf38a7e0 Mon Sep 17 00:00:00 2001 From: fumiama Date: Thu, 18 Feb 2021 18:07:08 +0800 Subject: [PATCH] fix fclose null fp --- server.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server.c b/server.c index 09b5602..596e8f7 100644 --- a/server.c +++ b/server.c @@ -51,7 +51,7 @@ void acceptTimer(void *p); int bindServer(uint16_t port, u_int try_times); int checkBuffer(int accept_fd, int *s, char *data, size_t numbytes); int freeAfterSend(int accept_fd, char *data, size_t length); -int closeDict(FILE *fp); +void closeDict(FILE *fp); int closeDictAndSend(FILE *fp, int accept_fd, char *data, size_t numbytes); off_t fileSize(const char* fname); void handleAccept(void *accept_fd_p); @@ -366,10 +366,12 @@ int closeDictAndSend(FILE *fp, int accept_fd, char *data, size_t numbytes) { return sendData(accept_fd, data, numbytes); } -int closeDict(FILE *fp) { +void closeDict(FILE *fp) { puts("Close dict"); - if(fp) flock(fileno(fp), LOCK_UN); - return fclose(fp); + if(fp) { + flock(fileno(fp), LOCK_UN); + fclose(fp); + } } int main(int argc, char *argv[]) {