mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Two fixes in the USB code.

Browse Source 
- Fixed possible segfault in the EHCI code.
- Fixed and improved backward compatibility code for USB port options.
This commit is contained in:
Volker Ruppert 2021-06-30 15:50:49 +00:00
parent 28b506f2de
commit 7e75d3d66b
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bochs/config.cc
View File

@ -2254,6 +2254,7 @@ int bx_parse_usb_port_params(const char *context, const char *param,
char tmpname[20], newopts[BX_PATHNAME_LEN];
char *devstr, *arg;
const char *opt = NULL, *origopts;
static bool compat_mode = false;
if (!strncmp(param, "port", 4)) {
devopt = 1;
@ -2274,6 +2275,7 @@ int bx_parse_usb_port_params(const char *context, const char *param,
}
sprintf(tmpname, "port%d.%s", idx, devopt ? "device" : "options");
if (devopt) {
compat_mode = false;
if (!SIM->get_param_enum(tmpname, base)->set_by_name(&param[plen + 2])) {
// backward compatibility code
devstr = strdup(&param[plen + 2]);
@ -2290,21 +2292,28 @@ int bx_parse_usb_port_params(const char *context, const char *param,
opt = "file";
}
if (opt != NULL) {
sprintf(tmpname, "port%d", idx);
base = (bx_list_c*)SIM->get_param(tmpname, base);
origopts = SIM->get_param_string("options", base)->getptr();
sprintf(tmpname, "port%d.options", idx);
origopts = SIM->get_param_string(tmpname, base)->getptr();
if (strlen(origopts) > 0) {
sprintf(newopts, "%s:%s, %s", opt, arg, origopts);
} else {
sprintf(newopts, "%s:%s", opt, arg);
}
SIM->get_param_string("options", base)->set(newopts);
SIM->get_param_string(tmpname, base)->set(newopts);
compat_mode = true;
}
}
free(devstr);
}
} else {
SIM->get_param_string(tmpname, base)->set(&param[plen + 2]);
if (compat_mode) {
origopts = SIM->get_param_string(tmpname, base)->getptr();
sprintf(newopts, "%s, %s", origopts, &param[plen + 2]);
compat_mode = false;
} else {
strcpy(newopts, &param[plen + 2]);
}
SIM->get_param_string(tmpname, base)->set(newopts);
}
return 0;
}

3
bochs/iodev/usb/usb_ehci.cc
View File

@ -185,6 +185,9 @@ bx_usb_ehci_c::bx_usb_ehci_c()
{
put("usb_ehci", "EHCI");
memset((void*)&hub, 0, sizeof(bx_usb_ehci_t));
for (int i = 0; i < 3; i++) {
uhci[i] = NULL;
}
rt_conf_id = -1;
hub.frame_timer_index = BX_NULL_TIMER_HANDLE;
}