From fc4ee229a653d0e9d71f828e513c9d458c1eab57 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Fri, 14 Jul 2017 11:48:52 -0400 Subject: Fix double delete in SkBmpCodec Previously, if ReadHeader returned false, it deleted the input stream. But there are a couple of cases where ReadHeader creates an SkCodec and then returns false. The SkCodec deletes the stream, and then so does NewFromStream. Make sure that we do not double delete by only deleting if no SkCodec was created. Add a test, so such a double delete will be caught by the bots. Bug: b/37623797 Change-Id: I787422c9af58f0b92ad9e9ef9ad87c54a12f5e31 Reviewed-on: https://skia-review.googlesource.com/23620 Reviewed-by: Derek Sollenberger Commit-Queue: Leon Scroggins --- resources/invalid_images/b37623797.ico | Bin 0 -> 63 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/invalid_images/b37623797.ico (limited to 'resources') diff --git a/resources/invalid_images/b37623797.ico b/resources/invalid_images/b37623797.ico new file mode 100644 index 0000000000..ebeb57acda Binary files /dev/null and b/resources/invalid_images/b37623797.ico differ -- cgit v1.2.3