[Scummvm-git-logs] scummvm master -> 65d098436446b464ba4095131dccf6cff05aecc4

bgK bastien.bouclet at gmail.com
Tue Nov 14 06:41:15 CET 2017


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

Summary:
65d0984364 GRAPHICS: Fix freeing invalid pointers in the BDF font destructor


Commit: 65d098436446b464ba4095131dccf6cff05aecc4
    https://github.com/scummvm/scummvm/commit/65d098436446b464ba4095131dccf6cff05aecc4
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2017-11-14T06:41:06+01:00

Commit Message:
GRAPHICS: Fix freeing invalid pointers in the BDF font destructor

Fixes a crash on exit when using a non default GUI font.
Possibly fixes #10318.

Changed paths:
    graphics/fonts/bdf.cpp


diff --git a/graphics/fonts/bdf.cpp b/graphics/fonts/bdf.cpp
index 00e9831..71911d2 100644
--- a/graphics/fonts/bdf.cpp
+++ b/graphics/fonts/bdf.cpp
@@ -694,6 +694,8 @@ BdfFont *BdfFont::loadFromCache(Common::SeekableReadStream &stream) {
 	data.bitmaps = bitmaps;
 	data.advances = advances;
 	data.boxes = boxes;
+	data.familyName = nullptr;
+	data.slant = nullptr;
 	return new BdfFont(data, DisposeAfterUse::YES);
 }
 





More information about the Scummvm-git-logs mailing list