AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[coretext] Speculative fix for CoreText nullptr access (#288)

Browse Source
This commit is contained in:
Ebrahim Byagowi 2016-07-12 03:49:21 +04:30 committed by Behdad Esfahbod
parent 6bf9db4f1e
commit 874421203e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hb-coretext.cc
View File

@ -164,21 +164,25 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size)
* system locations that we cannot access from the sandboxed renderer * system locations that we cannot access from the sandboxed renderer
* process in Blink. This can be detected by the new file URL location * process in Blink. This can be detected by the new file URL location
* that the newly found font points to. */ * that the newly found font points to. */
CFURLRef new_url = (CFURLRef)CTFontCopyAttribute(new_ct_font, kCTFontURLAttribute); CFURLRef new_url = (CFURLRef) CTFontCopyAttribute (new_ct_font, kCTFontURLAttribute);
if (CFEqual(original_url, new_url)) { // Keep reconfigured font if URL cannot be retrieved (seems to be the case
// on Mac OS 10.12 Sierra), speculative fix for crbug.com/625606
if (!original_url || !new_url || CFEqual (original_url, new_url)) {
CFRelease (ct_font); CFRelease (ct_font);
ct_font = new_ct_font; ct_font = new_ct_font;
} else { } else {
CFRelease(new_ct_font); CFRelease (new_ct_font);
DEBUG_MSG (CORETEXT, ct_font, "Discarding reconfigured CTFont, location changed."); DEBUG_MSG (CORETEXT, ct_font, "Discarding reconfigured CTFont, location changed.");
} }
CFRelease(new_url); if (new_url)
CFRelease (new_url);
} }
else else
DEBUG_MSG (CORETEXT, ct_font, "Font copy with empty cascade list failed"); DEBUG_MSG (CORETEXT, ct_font, "Font copy with empty cascade list failed");
} }
CFRelease(original_url); if (original_url)
CFRelease (original_url);
return ct_font; return ct_font;
} }