Skip to content

Commit 3e8224e

Browse files
committed
Merge remote-tracking branch 'origin/master' into xbb-master
2 parents b012d97 + 65ec422 commit 3e8224e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

test/recv-mshot-fair.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ static void *recv_fn(void *data)
248248
struct io_uring_buf_ring *br = NULL;
249249
struct io_uring ring;
250250
unsigned int buf_len;
251-
void *buf, *ptr;
251+
void *buf = NULL, *ptr;
252252
int ret, sock[NR_RDS], i;
253253
int brflags, ring_setup = 0;
254254

@@ -291,7 +291,7 @@ static void *recv_fn(void *data)
291291
ptr += buf_len;
292292
}
293293
io_uring_buf_ring_advance(br, RECV_BIDS);
294-
294+
295295
for (i = 0; i < NR_RDS; i++) {
296296
ret = recv_prep(&ring, &rds[i], &sock[i]);
297297
if (ret) {
@@ -329,6 +329,7 @@ static void *recv_fn(void *data)
329329
io_uring_free_buf_ring(&ring, br, RECV_BIDS, RECV_BGID);
330330
if (ring_setup)
331331
io_uring_queue_exit(&ring);
332+
free(buf);
332333
err:
333334
return (void *)(intptr_t)ret;
334335
}

test/ringbuf-loop.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,6 @@ int main(int argc, char *argv[])
8282

8383
io_uring_free_buf_ring(&ring, br, RENTRIES, BGID);
8484
io_uring_queue_exit(&ring);
85+
free(send_buf);
8586
return T_EXIT_PASS;
8687
}

0 commit comments

Comments
 (0)