joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3071 from nanshiki/fix_con

Browse Source 
Fix "DIR > NUL" crash
This commit is contained in:
Jonathan Campbell
2021-11-14 14:59:55 +00:00
committed by GitHub
parent 626ca82428 c30e88c781
commit 45027e0334
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dos/dos_devices.cpp
View File

@@ -227,6 +227,10 @@ uint32_t DOS_CheckExtDevice(const char *name, bool already_flag) {
}
}
}
// Exclude the default CON and NUL
if(real_readd(seg, off + 6) == 0 || real_readd(seg, off + 6) == 0xffffffff) {
return 0;
}
return (uint32_t)seg << 16 | (uint32_t)off;
}
}
@@ -788,7 +792,7 @@ uint8_t DOS_FindDevice(char const * name) {
DOS_CheckOpenExtDevice(name_part);
for(int index = DOS_DEVICES - 1 ; index >= 0 ; index--) {
if(Devices[index] && strcmp(name_part, "CON")) {
if(Devices[index]) {
if(Devices[index]->GetInformation() & EXT_DEVICE_BIT) {
if(WildFileCmp(name_part, Devices[index]->name)) {
if(DOS_CheckExtDevice(name_part, false) != 0) {