Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1180)

Unified Diff: Source/core/rendering/FastTextAutosizer.cpp

Issue 418253003: Don't dereference null pointer in FastTextAutosizer::getTentativeClusterRoots() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/FastTextAutosizer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/FastTextAutosizer.cpp
diff --git a/Source/core/rendering/FastTextAutosizer.cpp b/Source/core/rendering/FastTextAutosizer.cpp
index 226116b968af660ab2933b05f0573cf7f58447be..87f74efa524a252f1ae2a4a7d353627a90abb91b 100644
--- a/Source/core/rendering/FastTextAutosizer.cpp
+++ b/Source/core/rendering/FastTextAutosizer.cpp
@@ -721,7 +721,7 @@ FastTextAutosizer::Supercluster* FastTextAutosizer::getSupercluster(const Render
if (!fingerprint)
return 0;
- BlockSet* roots = &m_fingerprintMapper.getTentativeClusterRoots(fingerprint);
+ BlockSet* roots = m_fingerprintMapper.getTentativeClusterRoots(fingerprint);
if (!roots || roots->size() < 2 || !roots->contains(block))
return 0;
@@ -1074,9 +1074,9 @@ FastTextAutosizer::Fingerprint FastTextAutosizer::FingerprintMapper::get(const R
return m_fingerprints.get(renderer);
}
-FastTextAutosizer::BlockSet& FastTextAutosizer::FingerprintMapper::getTentativeClusterRoots(Fingerprint fingerprint)
+FastTextAutosizer::BlockSet* FastTextAutosizer::FingerprintMapper::getTentativeClusterRoots(Fingerprint fingerprint)
{
- return *m_blocksForFingerprint.get(fingerprint);
+ return m_blocksForFingerprint.get(fingerprint);
}
FastTextAutosizer::LayoutScope::LayoutScope(RenderBlock* block)
« no previous file with comments | « Source/core/rendering/FastTextAutosizer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698