diff options
| author | Torbjörn Andersson | 2011-12-27 23:25:45 +0100 |
|---|---|---|
| committer | Torbjörn Andersson | 2011-12-27 23:25:45 +0100 |
| commit | 411750ed4ac5e66fe154a946abb44149904b3947 (patch) | |
| tree | 7312536cb198caf1badaa95a18b960198456927f /engines | |
| parent | 5e915afcd4b410caadf6f17db45aa73352e3c07e (diff) | |
| download | scummvm-rg350-411750ed4ac5e66fe154a946abb44149904b3947.tar.gz scummvm-rg350-411750ed4ac5e66fe154a946abb44149904b3947.tar.bz2 scummvm-rg350-411750ed4ac5e66fe154a946abb44149904b3947.zip | |
CRUISE: Fix cppcheck warning about possible NULL pointer use.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/cruise/dataLoader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp index 66bc0fbf46..76479d7a10 100644 --- a/engines/cruise/dataLoader.cpp +++ b/engines/cruise/dataLoader.cpp @@ -369,14 +369,14 @@ int loadFNTSub(uint8 *ptr, int destIdx) { destPtr = filesDatabase[fileIndex].subData.ptr; - memcpy(destPtr, ptr2, loadFileVar1); - - //fontSize = READ_BE_UINT32(ptr2); - if (destPtr != NULL) { int32 i; uint8 *currentPtr; + memcpy(destPtr, ptr2, loadFileVar1); + + //fontSize = READ_BE_UINT32(ptr2); + destPtr = filesDatabase[fileIndex].subData.ptr; bigEndianLongToNative((int32 *) destPtr); |