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

Fix nullptr deref in cache lookup

Browse Source 
An inner function was taking a ptr where almost everything
calling took a ref. All the ref's were ok, but the test was
still passing in a nullptr. Fix API and test.

Change-Id: I5bcb93f52fc1c58f7bb135b5891223ed863eaede
Reviewed-on: https://skia-review.googlesource.com/154860
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Herb Derby 2018-09-17 11:39:51 -04:00 committed by Skia Commit-Bot
parent 581cf0dfc6
commit c03716dd76
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/SkRemoteGlyphCache.cpp
View File

@ -207,7 +207,7 @@ void add_fallback_text_to_cache(const GrTextContext::FallbackGlyphRunHelper& hel
SkScalerContextEffects effects;
auto* glyphCacheState =
server->getOrCreateCache(fallbackPaint, &props, &fallbackMatrix,
server->getOrCreateCache(fallbackPaint, props, fallbackMatrix,
SkScalerContextFlags::kFakeGammaAndBoostContrast, &effects);
for (auto glyphID : helper.fallbackText()) {
@ -285,7 +285,7 @@ void SkTextBlobCacheDiffCanvas::TrackLayerDevice::processGlyphRunForMask(
SkScalerContextEffects effects;
auto* glyphCacheState = fStrikeServer->getOrCreateCache(
runPaint, &this->surfaceProps(), &runMatrix,
runPaint, this->surfaceProps(), runMatrix,
SkScalerContextFlags::kFakeGammaAndBoostContrast, &effects);
SkASSERT(glyphCacheState);
@ -321,7 +321,7 @@ void SkTextBlobCacheDiffCanvas::TrackLayerDevice::processGlyphRunForPaths(
SkScalerContextEffects effects;
auto* glyphCacheState = fStrikeServer->getOrCreateCache(
pathPaint, &this->surfaceProps(), &SkMatrix::I(),
pathPaint, this->surfaceProps(), SkMatrix::I(),
SkScalerContextFlags::kFakeGammaAndBoostContrast, &effects);
const bool asPath = true;
@ -369,8 +369,8 @@ bool SkTextBlobCacheDiffCanvas::TrackLayerDevice::maybeProcessGlyphRunForDFT(
GrTextContext::InitDistanceFieldPaint(nullptr, &dfPaint, runMatrix, options, &textRatio,
&flags);
SkScalerContextEffects effects;
auto* glyphCacheState = fStrikeServer->getOrCreateCache(dfPaint, &this->surfaceProps(),
&SkMatrix::I(), flags, &effects);
auto* glyphCacheState = fStrikeServer->getOrCreateCache(dfPaint, this->surfaceProps(),
SkMatrix::I(), flags, &effects);
GrTextContext::FallbackGlyphRunHelper fallbackTextHelper(runMatrix, runPaint, textRatio);
const bool asPath = false;
@ -473,12 +473,12 @@ void SkStrikeServer::writeStrikeData(std::vector<uint8_t>* memory) {
SkStrikeServer::SkGlyphCacheState* SkStrikeServer::getOrCreateCache(
const SkPaint& paint,
const SkSurfaceProps* props,
const SkMatrix* matrix,
const SkSurfaceProps& props,
const SkMatrix& matrix,
SkScalerContextFlags flags,
SkScalerContextEffects* effects) {
SkAutoDescriptor keyAutoDesc;
auto keyDesc = create_descriptor(kKey, paint, *matrix, *props, flags, &keyAutoDesc, effects);
auto keyDesc = create_descriptor(kKey, paint, matrix, props, flags, &keyAutoDesc, effects);
// In cases where tracing is turned off, make sure not to get an unused function warning.
// Lambdaize the function.
@ -510,7 +510,7 @@ SkStrikeServer::SkGlyphCacheState* SkStrikeServer::getOrCreateCache(
SkScalerContextEffects deviceEffects;
SkAutoDescriptor deviceAutoDesc;
auto deviceDesc = create_descriptor(
kDevice, paint, *matrix, *props, flags, &deviceAutoDesc, &deviceEffects);
kDevice, paint, matrix, props, flags, &deviceAutoDesc, &deviceEffects);
SkASSERT(cache->getDeviceDescriptor() == *deviceDesc);
#endif
bool locked = fDiscardableHandleManager->lockHandle(it->second->discardableHandleId());
@ -536,7 +536,7 @@ SkStrikeServer::SkGlyphCacheState* SkStrikeServer::getOrCreateCache(
SkScalerContextEffects deviceEffects;
SkAutoDescriptor deviceAutoDesc;
auto deviceDesc = create_descriptor(
kDevice, paint, *matrix, *props, flags, &deviceAutoDesc, &deviceEffects);
kDevice, paint, matrix, props, flags, &deviceAutoDesc, &deviceEffects);
auto context = tf->createScalerContext(deviceEffects, deviceDesc);

2
src/core/SkRemoteGlyphCache.h
View File

@ -124,7 +124,7 @@ public:
// Methods used internally in skia ------------------------------------------
class SkGlyphCacheState;
SkGlyphCacheState* getOrCreateCache(const SkPaint&, const SkSurfaceProps*, const SkMatrix*,
SkGlyphCacheState* getOrCreateCache(const SkPaint&, const SkSurfaceProps&, const SkMatrix&,
SkScalerContextFlags flags,
SkScalerContextEffects* effects);

4
tests/SkRemoteGlyphCacheTest.cpp
View File

@ -789,7 +789,9 @@ DEF_TEST(SkRemoteGlyphCache_ReWriteGlyph, reporter) {
SkScalerContextEffects effects;
SkScalerContextFlags flags = SkScalerContextFlags::kFakeGammaAndBoostContrast;
paint.setTypeface(serverTf);
auto* cacheState = server.getOrCreateCache(paint, nullptr, nullptr, flags, &effects);
auto* cacheState = server.getOrCreateCache(
paint, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType),
SkMatrix::I(), flags, &effects);
cacheState->addGlyph(lostGlyphID, false);
std::vector<uint8_t> serverStrikeData;