Fix fd leak with fsockout

pull/155/head
Michael Black 2019-12-19 17:09:18 -06:00
rodzic 4b442dba94
commit bfe28e8032
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
1 zmienionych plików z 9 dodań i 5 usunięć

Wyświetl plik

@ -212,7 +212,7 @@ static void handle_error(enum rig_debug_level_e lvl, const char *msg)
(LPTSTR)&lpMsgBuf, 0, NULL)) (LPTSTR)&lpMsgBuf, 0, NULL))
{ {
rig_debug(lvl, "%s: Network error %d: %s\n", msg, e, (char*)lpMsgBuf); rig_debug(lvl, "%s: Network error %d: %s\n", msg, e, (char *)lpMsgBuf);
LocalFree(lpMsgBuf); LocalFree(lpMsgBuf);
} }
else else
@ -979,6 +979,7 @@ void *handle_socket(void *arg)
if (retcode == 1) if (retcode == 1)
{ {
rig_close(my_rig);
retcode = rig_open(my_rig); retcode = rig_open(my_rig);
} }
} }
@ -1031,10 +1032,13 @@ void *handle_socket(void *arg)
host, host,
serv); serv);
fclose(fsockin); retcode = fclose(fsockin);
#ifndef __MINGW32__
fclose(fsockout); if (retcode != 0) { rig_debug(RIG_DEBUG_ERR, "%s: fclose(fsockin) %s\n", __func__, strerror(retcode)); }
#endif
retcode = fclose(fsockout);
if (retcode != 0) { rig_debug(RIG_DEBUG_ERR, "%s: fclose(fsockout) %s\n", __func__, strerror(retcode)); }
handle_exit: handle_exit:
#ifdef __MINGW32__ #ifdef __MINGW32__