[Scummvm-cvs-logs] SF.net SVN: scummvm:[47410] scummvm/trunk/engines/sci/graphics

[m_kiewitz at users.sourceforge.net]

Revision: 47410
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47410&view=rev
Author:   m_kiewitz
Date:     2010-01-20 20:09:24 +0000 (Wed, 20 Jan 2010)

Log Message:
-----------
SCI: boundary check on getPortById()

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/windowmgr.cpp
    scummvm/trunk/engines/sci/graphics/windowmgr.h

Modified: scummvm/trunk/engines/sci/graphics/windowmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/windowmgr.cpp	2010-01-20 19:45:42 UTC (rev 47409)
+++ scummvm/trunk/engines/sci/graphics/windowmgr.cpp	2010-01-20 20:09:24 UTC (rev 47410)
@@ -283,4 +283,10 @@
 	}
 }
 
+Port *WindowMgr::getPortById(uint16 id) {
+	if (id > _windowsById.size())
+		error("getPortById() received invalid id");
+	return _windowsById[id];
+}
+
 } // End of namespace Sci

Modified: scummvm/trunk/engines/sci/graphics/windowmgr.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/windowmgr.h	2010-01-20 19:45:42 UTC (rev 47409)
+++ scummvm/trunk/engines/sci/graphics/windowmgr.h	2010-01-20 20:09:24 UTC (rev 47410)
@@ -46,7 +46,7 @@
 	void DisposeWindow(Window *pWnd, bool reanimate);
 	void UpdateWindow(Window *wnd);
 
-	Port *getPortById(uint16 id) const { return _windowsById[id]; }
+	Port *getPortById(uint16 id);
 
 	Port *_wmgrPort;
 	Window *_picWind;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.