[Scummvm-git-logs] scummvm master -> 311bb2f1b6e7bb2f0bf6c64f6e30719c3ba5c199

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7396965005 GRAPHICS: Fix number of memory leaks and wanrings
311bb2f1b6 DIRECTOR: Fix memory leak


Commit: 7396965005667e2104473af57de34de8b93a1350
    https://github.com/scummvm/scummvm/commit/7396965005667e2104473af57de34de8b93a1350
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-23T20:27:00+01:00

Commit Message:
GRAPHICS: Fix number of memory leaks and wanrings

Changed paths:
    graphics/fonts/macfont.cpp
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/fonts/macfont.cpp b/graphics/fonts/macfont.cpp
index f20b64e..41b5df8 100644
--- a/graphics/fonts/macfont.cpp
+++ b/graphics/fonts/macfont.cpp
@@ -86,6 +86,7 @@ MacFontFamily::MacFontFamily() {
 	_ffNumOffsets = 0;
 	_ffOffsets = nullptr;
 	_ffNumBBoxes = 0;
+	_ffNumKerns = 0;
 }
 
 MacFontFamily::~MacFontFamily() {
@@ -185,7 +186,7 @@ bool MacFontFamily::load(Common::SeekableReadStream &stream) {
 			_ffKernEntries[i]._entryLength = stream.readUint16BE();
 			_ffKernEntries[i]._kernPairs.resize(_ffKernEntries[i]._entryLength);
 
-			debug(10, "  style: %x kernpairs: %d", _ffKernEntries[i]._style, _ffKernEntries[i]._entryLength);
+			debug(10, "  style: %x kernpairs: %u", _ffKernEntries[i]._style, _ffKernEntries[i]._entryLength);
 
 			for (uint j = 0; j < _ffKernEntries[i]._entryLength; j++) {
 				byte f, s;
@@ -283,7 +284,7 @@ bool MacFONTFont::loadFont(Common::SeekableReadStream &stream, MacFontFamily *fa
 	_data._glyphs.resize(glyphCount);
 
 	// Bit image table
-	uint16 bitImageSize = _data._rowWords * _data._fRectHeight;
+	uint bitImageSize = _data._rowWords * _data._fRectHeight;
 	_data._bitImage = new byte[bitImageSize];
 	stream.read(_data._bitImage, bitImageSize);
 
@@ -333,6 +334,8 @@ bool MacFONTFont::loadFont(Common::SeekableReadStream &stream, MacFontFamily *fa
 			stream.readUint16BE();
 	}
 
+	free(bitmapOffsets);
+
 	return true;
 }
 
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index d49f17c..0e5bba2 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -215,6 +215,7 @@ void MacFontManager::loadFonts() {
 		}
 
 		delete stream;
+		delete fontFile;
 	}
 
 	_builtInFonts = false;


Commit: 311bb2f1b6e7bb2f0bf6c64f6e30719c3ba5c199
    https://github.com/scummvm/scummvm/commit/311bb2f1b6e7bb2f0bf6c64f6e30719c3ba5c199
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-23T20:28:07+01:00

Commit Message:
DIRECTOR: Fix memory leak

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 89018f5..527cf7a 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -214,6 +214,8 @@ void DirectorEngine::testFonts() {
 			font.load(*stream);
 		}
 	}
+
+	delete fontFile;
 }
 
 } // End of namespace Director