From: Alyssa M. <fu...@us...> - 2011-05-15 17:00:51
|
gemrb: Infinity Engine emulator The branch master has been updated via 0e6df021b59dd6811b94c9d75ffed40b46833d80 (commit) Summary of changes: gemrb/plugins/GUIScript/GUIScript.cpp | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) from fede95e0b3ce3af60a43c06a995773f2c04ffe90 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=0e6df021b59dd6811b94c9d75ffed40b46833d80 commit 0e6df021b59dd6811b94c9d75ffed40b46833d80 Author: Alyssa Milburn <fu...@fu...> Date: Sun May 15 18:59:49 2011 +0200 GUIScript: Add some minimal sanity checks to FillPlayerInfo. diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp index 04cd88e..2d6bb20 100644 --- a/gemrb/plugins/GUIScript/GUIScript.cpp +++ b/gemrb/plugins/GUIScript/GUIScript.cpp @@ -5219,9 +5219,12 @@ static PyObject* GemRB_FillPlayerInfo(PyObject * /*self*/, PyObject* args) } int mastertable = gamedata->LoadTable( "avprefix" ); Holder<TableMgr> mtm = gamedata->GetTable( mastertable ); + if (!mtm) { + return RuntimeError("Couldn't load avprefix table."); + } int count = mtm->GetRowCount(); if (count< 1 || count>8) { - return RuntimeError("Table is invalid." ); + return RuntimeError("avprefix table contains no entries." ); } const char *poi = mtm->QueryField( 0 ); // the base animation id @@ -5231,6 +5234,9 @@ static PyObject* GemRB_FillPlayerInfo(PyObject * /*self*/, PyObject* args) poi = mtm->QueryField( i ); int table = gamedata->LoadTable( poi ); Holder<TableMgr> tm = gamedata->GetTable( table ); + if (!tm) { + return RuntimeError("Couldn't load an avprefix table."); + } int StatID = atoi( tm->QueryField() ); StatID = MyActor->GetBase( StatID ); poi = tm->QueryField( StatID ); ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |