diff options
| author |  skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> | 2018-05-24 18:30:09 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-24 19:53:41 +0000 |
| commit | 7cd740790180438d87c80be2a7eec1e71485c2b0 (patch) | |
| tree | b5d8c03d651ed54c82c4d0e7e09b6c710aff27a7 /third_party | |
| parent | be6e575ee725e8304e782b60eebf515036215288 (diff) | |
Roll skia/third_party/skcms b01dbd2..a8a5c9e (1 commits)
https://skia.googlesource.com/skcms.git/+log/b01dbd2..a8a5c9e
2018-05-24 brianosman@google.com Fix NULL dereference when using skcms to just do format conversion
The AutoRoll server is located here: https://skcms-skia-roll.skia.org
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=allanmac@google.com
Change-Id: I9c2f469dcaf70f89c85696c2aa0c7a5690235301
Reviewed-on: https://skia-review.googlesource.com/130006
Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/skcms/src/Transform.c | 2 | ||||
| -rwxr-xr-x | third_party/skcms/version.sha1 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/skcms/src/Transform.c b/third_party/skcms/src/Transform.c index 9bf66118f2..df31c7a1af 100644 --- a/third_party/skcms/src/Transform.c +++ b/third_party/skcms/src/Transform.c @@ -433,7 +433,7 @@ bool skcms_Transform(const void* src, *ops++ = Op_swap_rb; } - if (srcProfile->data_color_space == skcms_Signature_CMYK) { + if (srcProfile && srcProfile->data_color_space == skcms_Signature_CMYK) { // Photoshop creates CMYK images as inverse CMYK. // These happen to be the only ones we've _ever_ seen. *ops++ = Op_invert; diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index b56792eab7..685b6b7ffa 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -b01dbd249b2e6cfc44e4e9831223c89b6009434f
\ No newline at end of file +a8a5c9ee1b323d5919e54e1c105f207ad635baa8
\ No newline at end of file |