Skip to content

Commit e587c4b

Browse files
wanghaEMQJaylinYu
authored andcommitted
* FIX [quic] Fixed the error that close a null quic connection.
Signed-off-by: wangha <wanghamax@gmail.com>
1 parent 870d28c commit e587c4b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/supplemental/quic/msquic_dial.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,8 +600,10 @@ quic_dialer_fini(nni_quic_dialer *d)
600600
{
601601
// dialer is bound to QUIC connection
602602
log_info("connection %p fini", d->qconn);
603-
msquic_conn_close(d->qconn, 0);
604-
msquic_conn_fini(d->qconn);
603+
if (d->qconn) {
604+
msquic_conn_close(d->qconn, 0);
605+
msquic_conn_fini(d->qconn);
606+
}
605607
nni_aio_abort(d->qconaio, NNG_ECLOSED);
606608
nni_aio_wait(d->qconaio);
607609
nni_aio_free(d->qconaio);
@@ -1528,6 +1530,7 @@ msquic_close()
15281530
if (MsQuic != NULL) {
15291531
if (configuration != NULL) {
15301532
MsQuic->ConfigurationClose(configuration);
1533+
configuration = NULL;
15311534
}
15321535
if (registration != NULL) {
15331536
// This will block until all outstanding child objects
@@ -1580,7 +1583,7 @@ msquic_load_config(QUIC_SETTINGS *settings, nni_quic_dialer *d)
15801583
QUIC_STATUS rv = QUIC_STATUS_SUCCESS;
15811584
if (QUIC_FAILED(rv = MsQuic->ConfigurationOpen(registration,
15821585
&quic_alpn, 1, settings, sizeof(*settings), NULL, &configuration))) {
1583-
log_error("ConfigurationOpen failed, 0x%x!\n", rv);
1586+
log_error("ConfigurationOpen failed, 0x%x! settings%p\n", rv, settings);
15841587
return FALSE;
15851588
}
15861589

0 commit comments

Comments
 (0)