src/utils/win/SkDWriteFontFileStream.cpp - Issue 18503009: Fix SkTFits in to work properly with signed/unsigned mixtures.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/utils/win/SkDWriteFontFileStream.cpp

Issue 18503009: Fix SkTFits in to work properly with signed/unsigned mixtures. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: Remove enable_if, use SK_COMPILE_ASSERT instead. Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: src/utils/win/SkDWriteFontFileStream.cpp

===================================================================

--- src/utils/win/SkDWriteFontFileStream.cpp (revision 9972)

+++ src/utils/win/SkDWriteFontFileStream.cpp (working copy)

@@ -9,10 +9,10 @@

#include "SkDWriteFontFileStream.h"

#include "SkHRESULT.h"

#include "SkTemplates.h"

+#include "SkTFitsIn.h"

#include "SkTScopedComPtr.h"

#include <dwrite.h>

-#include <limits>

///////////////////////////////////////////////////////////////////////////////

// SkIDWriteFontFileStream

@@ -183,7 +183,7 @@

return E_FAIL;

}

- if (fileOffset + fragmentSize > (std::numeric_limits<size_t>::max)()) {

+ if (!SkTFitsIn<size_t>(fileOffset + fragmentSize)) {

return E_FAIL;

}