fix(storage/vfs): Remove va_end leak in ioctl caused by early return in macro

This commit is contained in:
Tomáš Rohlínek
2026-01-08 11:48:36 +01:00
parent ce41754cf3
commit 843a553790
+14 -2
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -595,10 +595,22 @@ int esp_vfs_ioctl(int fd, int cmd, ...)
__errno_r(r) = EBADF;
return -1;
}
if (vfs->vfs.ioctl == NULL) {
__errno_r(r) = ENOSYS;
return -1;
}
int ret;
va_list args;
va_start(args, cmd);
CHECK_AND_CALL(ret, r, vfs, ioctl, local_fd, cmd, args);
if (vfs->vfs.flags & ESP_VFS_FLAG_CONTEXT_PTR) {
ret = vfs->vfs.ioctl_p(vfs->ctx, local_fd, cmd, args);
} else {
ret = vfs->vfs.ioctl(local_fd, cmd, args);
}
va_end(args);
return ret;
}