diff options
| author | Colin Snover | 2016-12-31 20:39:57 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-03-27 19:42:31 -0500 |
| commit | 31daa956d62b39429cb6638ed3fb549ac488833a (patch) | |
| tree | fa831adefae05d82209b3f565055f7b761ca8691 /engines/sci/graphics/maciconbar.cpp | |
| parent | 1298762b7665dc1b7aeedf0271eadfb284309ef1 (diff) | |
| download | scummvm-rg350-31daa956d62b39429cb6638ed3fb549ac488833a.tar.gz scummvm-rg350-31daa956d62b39429cb6638ed3fb549ac488833a.tar.bz2 scummvm-rg350-31daa956d62b39429cb6638ed3fb549ac488833a.zip | |
SCI: Implement bounds-checked reads of game resources
Diffstat (limited to 'engines/sci/graphics/maciconbar.cpp')
| -rw-r--r-- | engines/sci/graphics/maciconbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/maciconbar.cpp b/engines/sci/graphics/maciconbar.cpp index e10b9fddbf..3a62760398 100644 --- a/engines/sci/graphics/maciconbar.cpp +++ b/engines/sci/graphics/maciconbar.cpp @@ -203,11 +203,11 @@ void GfxMacIconBar::setInventoryIcon(int16 icon) { Graphics::Surface *GfxMacIconBar::loadPict(ResourceId id) { Resource *res = g_sci->getResMan()->findResource(id, false); - if (!res || res->size == 0) + if (!res || res->size() == 0) return 0; Image::PICTDecoder pictDecoder; - Common::MemoryReadStream stream(res->data, res->size); + Common::MemoryReadStream stream(res->toStream()); if (!pictDecoder.loadStream(stream)) return 0; |