Skip to content

Commit b0cdac8

Browse files
author
Elizabeth Chan
committed
Merge fix for TRQ-2374 from master.
1 parent e1ed6f1 commit b0cdac8

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

src/lib/Libifl/pbsD_connect.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,10 @@ int pbs_disconnect(
13771377
pbs_disconnect_socket(sock);
13781378

13791379
if (connection[connect].ch_errtxt != (char *)NULL)
1380+
{
13801381
free(connection[connect].ch_errtxt);
1382+
connection[connect].ch_errtxt = (char *)NULL;
1383+
}
13811384

13821385
connection[connect].ch_errno = 0;
13831386
connection[connect].ch_inuse = FALSE;

src/scheduler.basl/af_server.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,10 @@ server_disconnect(int connect)
12311231
close(connection[connect].ch_socket);
12321232

12331233
if (connection[connect].ch_errtxt != (char *)NULL)
1234+
{
12341235
free(connection[connect].ch_errtxt);
1236+
connection[connect].ch_errtxt = (char *)NULL;
1237+
}
12351238

12361239
connection[connect].ch_errno = 0;
12371240

src/scheduler.tcl/pbs_sched.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,10 @@ server_disconnect(int connect)
204204
close(connection[connect].ch_socket);
205205

206206
if (connection[connect].ch_errtxt != (char *)NULL)
207+
{
207208
free(connection[connect].ch_errtxt);
209+
connection[connect].ch_errtxt = (char *)NULL;
210+
}
208211

209212
connection[connect].ch_errno = 0;
210213

0 commit comments

Comments
 (0)