commit 6ca9c6f41224050d92cae548e915f5b9175efe8b
author Jim Van Verth <jvanverth@google.com> Wed Sep 27 18:04:34 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 27 22:23:28 2017 +0000
tree e385ee779c1f9dfa407d9d3bad39998ea05e7e7d
parent 0b5e7d16c20f4c5b75377f6722fc1bb57e63e9f3

Fix crash in setLastUseTokenBulk

Bug: skia:3550
Change-Id: I00f83f40b30549cbfcb65e6a39afba6355d62299
Reviewed-on: https://skia-review.googlesource.com/52420
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/gpu/GrDrawOpAtlas.h

diff --git a/src/gpu/GrDrawOpAtlas.h b/src/gpu/GrDrawOpAtlas.h
index d4a81a0..2031d2e 100644
--- a/src/gpu/GrDrawOpAtlas.h
+++ b/src/gpu/GrDrawOpAtlas.h
@@ -195,9 +195,11 @@
         int count = updater.fPlotsToUpdate.count();
         for (int i = 0; i < count; i++) {
             const BulkUseTokenUpdater::PlotData& pd = updater.fPlotsToUpdate[i];
-            Plot* plot = fPages[pd.fPageIndex].fPlotArray[pd.fPlotIndex].get();
-            this->makeMRU(plot, pd.fPageIndex);
-            plot->setLastUseToken(token);
+            if (pd.fPageIndex < fNumPages) {
+                Plot* plot = fPages[pd.fPageIndex].fPlotArray[pd.fPlotIndex].get();
+                this->makeMRU(plot, pd.fPageIndex);
+                plot->setLastUseToken(token);
+            }
         }
     }