valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Fix NULL issues in programs-related code

Browse source
This commit is contained in:
krcroft 2020-01-18 15:28:53 -08:00 • committed by Patryk Obara
parent 3391651323
commit ec52c3ef3d
2 changed files with 117 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/misc/programs.cpp
View file

@ -53,6 +53,11 @@ static std::vector<PROGRAMS_Main*> internal_progs;
void PROGRAMS_MakeFile(char const * const name,PROGRAMS_Main * main) {
Bit8u * comdata=(Bit8u *)malloc(32); //MEM LEAK
if (comdata == nullptr) {
E_Exit("Could not allocate memory for com-file data.");
}
memcpy(comdata,&exe_block,sizeof(exe_block));
comdata[CB_POS]=(Bit8u)(call_program&0xff);
comdata[CB_POS+1]=(Bit8u)((call_program>>8)&0xff);
@ -429,7 +434,7 @@ void CONFIG::Run(void) {
// sanity check
Section* sec = control->GetSection(pvars[0].c_str());
Section* sec2 = control->GetSectionFromProperty(pvars[1].c_str());
if (sec != sec2) {
if (!sec || !sec2 || sec != sec2) {
WriteOut(MSG_Get("PROGRAM_CONFIG_PROPERTY_ERROR"));
}
break;
@ -520,6 +525,10 @@ void CONFIG::Run(void) {
case P_AUTOEXEC_CLEAR: {
Section_line* sec = dynamic_cast <Section_line*>
(control->GetSection(std::string("autoexec")));
if (!sec) {
WriteOut(MSG_Get("PROGRAM_CONFIG_SECTION_ERROR"));
return;
}
sec->data.clear();
break;
}
@ -530,13 +539,22 @@ void CONFIG::Run(void) {
}
Section_line* sec = dynamic_cast <Section_line*>
(control->GetSection(std::string("autoexec")));
for(Bitu i = 0; i < pvars.size(); i++) sec->HandleInputline(pvars[i]);
if (!sec) {
WriteOut(MSG_Get("PROGRAM_CONFIG_SECTION_ERROR"));
return;
}
for(Bitu i = 0; i < pvars.size(); i++) {
sec->HandleInputline(pvars[i]);
}
break;
}
case P_AUTOEXEC_TYPE: {
Section_line* sec = dynamic_cast <Section_line*>
(control->GetSection(std::string("autoexec")));
if (!sec) {
WriteOut(MSG_Get("PROGRAM_CONFIG_SECTION_ERROR"));
return;
}
WriteOut("\n%s",sec->data.c_str());
break;
}