Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/GUI: Fix null pointer dereference

Browse Source
This commit is contained in:
TGEnigma
2018-01-27 15:01:33 +01:00
committed by kd-11
parent e7537cded5
commit 55821041bf
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp
+6 -1
View File
@@ -315,6 +315,11 @@ s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::cptr<char> msgStrin
{ {
cellSysutil.warning("cellMsgDialogProgressBarSetMsg(progressBarIndex=%d, msgString=%s)", progressBarIndex, msgString); cellSysutil.warning("cellMsgDialogProgressBarSetMsg(progressBarIndex=%d, msgString=%s)", progressBarIndex, msgString);
if (!msgString)
{
return CELL_MSGDIALOG_ERROR_PARAM;
}
if (auto rsxthr = fxm::get<GSRender>()) if (auto rsxthr = fxm::get<GSRender>())
{ {
if (auto dlg2 = rsxthr->shell_get_current_dialog()) if (auto dlg2 = rsxthr->shell_get_current_dialog())
@@ -331,7 +336,7 @@ s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::cptr<char> msgStrin
return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED; return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
} }
if (progressBarIndex >= dlg->type.progress_bar_count || !msgString) if (progressBarIndex >= dlg->type.progress_bar_count)
{ {
return CELL_MSGDIALOG_ERROR_PARAM; return CELL_MSGDIALOG_ERROR_PARAM;
} }