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

SkPDF: ASAN fix: don't double ref new SkPDFBitmap objects

Browse Source 
TBR=robertphillips@google.com,tomhudson@google.com,

Review URL: https://codereview.chromium.org/1381073005
This commit is contained in:
halcanary 2015-10-01 11:06:22 -07:00 committed by Commit bot
parent f174e92873
commit 3d8c33cd83
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pdf/SkPDFDevice.cpp
View File

@ -2282,7 +2282,7 @@ void SkPDFDevice::internalDrawImage(const SkMatrix& origMatrix,
// TODO(halcanary): de-dupe this by caching filtered images. // TODO(halcanary): de-dupe this by caching filtered images.
// (maybe in the resource cache?) // (maybe in the resource cache?)
} }
SkAutoTUnref<SkPDFObject> pdfimage(fCanon->findPDFBitmap(image)); SkAutoTUnref<SkPDFObject> pdfimage(SkSafeRef(fCanon->findPDFBitmap(image)));
if (!pdfimage) { if (!pdfimage) {
pdfimage.reset(SkPDFCreateBitmapObject(image)); pdfimage.reset(SkPDFCreateBitmapObject(image));
if (!pdfimage) { if (!pdfimage) {
@ -2290,6 +2290,6 @@ void SkPDFDevice::internalDrawImage(const SkMatrix& origMatrix,
} }
fCanon->addPDFBitmap(image->uniqueID(), pdfimage); fCanon->addPDFBitmap(image->uniqueID(), pdfimage);
} }
SkPDFUtils::DrawFormXObject(this->addXObjectResource(SkRef(pdfimage.get())), SkPDFUtils::DrawFormXObject(this->addXObjectResource(pdfimage.get()),
&content.entry()->fContent); &content.entry()->fContent);
} }