aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/pdf
diff options
context:
space:
mode:
authorGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-06 18:08:05 +0000
committerGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-06 18:08:05 +0000
commit665b2cca88e25b821a69c9ce8a4fd7f551532012 (patch)
tree4b1f840ed9db09b30ee5aa0539d1bc46a24b232c /src/pdf
parent1335264fce00389c7d82105a52626ea2f48d277a (diff)
lockPixels before calling getColorTable.
Fixes a bug where we try to dereference a NULL pointer. Update the comment for SkBitmap::getColorTable, telling the client that pixels must be locked for it to return non-NULL. R=edisonn@google.com Review URL: https://codereview.chromium.org/15002002 git-svn-id: http://skia.googlecode.com/svn/trunk@9018 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pdf')
-rw-r--r--src/pdf/SkPDFImage.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index 04307be77e..102bd58b53 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -321,6 +321,7 @@ SkPDFImage::SkPDFImage(SkStream* imageData,
insertName("ColorSpace", "DeviceGray");
} else if (config == SkBitmap::kIndex8_Config ||
config == SkBitmap::kRLE_Index8_Config) {
+ SkAutoLockPixels alp(bitmap);
insert("ColorSpace",
makeIndexedColorSpace(bitmap.getColorTable()))->unref();
} else {