| commit | 641cce90c99f17e7c4d3d6407c3c4bbf591c5a3f | [log] [tgz] |
|---|---|---|
| author | edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jul 30 12:09:14 2013 +0000 |
| committer | edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jul 30 12:09:14 2013 +0000 |
| tree | 525e1711d53073e510ec9cb4cfac812b6f29dafe | |
| parent | 16d53aac9c78635b25d930f1c20d677e8fdd29c3 [diff] |
pdfviewer: fix condition for element in array, reset back the default color to white, and verify type before value in PDF API mapper Review URL: https://codereview.chromium.org/21017004 git-svn-id: http://skia.googlecode.com/svn/trunk@10427 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp b/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp index e54ba82..9e89b84 100644 --- a/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp +++ b/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp
@@ -504,12 +504,12 @@ SkASSERT(!(id < 0 || id > fObjects.count())); - if (id < 0 || id > fObjects.count()) { + // TODO(edisonn): verify id and gen expected + if (id < 0 || id >= fObjects.count()) { + // TODO(edisonn): report error/warning return NULL; } - // TODO(edisonn): verify id and gen expected - if (fObjects[id].fResolvedReference != NULL) { return fObjects[id].fResolvedReference; }