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

Fixed possible segfault when accessing BXPN_SOUND_WAVEIN with base argument

Browse Source 
(patch by Dawn Teschendorf)
Added partial summary to CHANGES
This commit is contained in:
Volker Ruppert 2014-05-26 19:39:15 +00:00
parent 42afaef2ba
commit 353e34f338
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bochs/CHANGES
View File

@ -1,7 +1,14 @@
Changes in 2.6.5 (not yet released - updated May 23, 2014):
Changes in 2.6.5 (not yet released - updated May 26, 2014):
Brief summary :
TODO
- TODO: cpu, debugger, ...
- Gui debugger output window now can be used as a log viewer
- Added built-in slirp (user-mode networking) support (ported from Qemu)
- Added global sound config option and volume control support to the devices
- Added new experimental gui 'vncsrv" using the LibVNCServer library
- Rewrite of the bximage utility in C++ for image creation, conversion and resize
Detailed change log :
- CPU
- Bugfixes for CPU emulation correctness (critical fixes for XSAVE, VMX, TBM/BMI and RDRAND instructions)
@ -42,7 +49,7 @@ Brief summary :
- Added new bochsrc option to control the speaker output mode
- Added support to specify the initial time for 'clock' option in ctime(3) string format
- Added support for the LTDL_LIBRARY_PATH variable with MSVC plugins
- All SB16 / ES1370 are now changable at runtime
- All SB16 / ES1370 options are now changable at runtime
- textconfig: added menu item for saving configuration at runtime
- Added bochsrc option for the Voodoo Graphics emulation (experimental)

2
bochs/iodev/sound/sb16.cc
View File

@ -1294,7 +1294,7 @@ void bx_sb16_c::dsp_dma(Bit8u command, Bit8u mode, Bit16u length, Bit8u comp)
}
} else {
if (DSP.inputinit == 0) {
ret = BX_SB16_OUTPUT->openwaveinput(SIM->get_param_string(BXPN_SOUND_WAVEIN, base)->getptr(), sb16_adc_handler);
ret = BX_SB16_OUTPUT->openwaveinput(SIM->get_param_string(BXPN_SOUND_WAVEIN)->getptr(), sb16_adc_handler);
if (ret != BX_SOUNDLOW_OK) {
BX_SB16_THIS wavemode = 0;
writelog(WAVELOG(2), "Error: Could not open wave input device.");