From bf137c3dbd05cc8c81839063abc0df3547b4a300 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 28 Feb 2013 09:48:27 +0000 Subject: [PATCH 2/2] Use cmsSignalError() if failing in cmsSmoothToneCurve() Just returning with FALSE isn't helpful, and setting breakpoints in code just to figure out why it's aborting shouldn't be required when there's an out-of-band way of signalling errors. --- src/cmsgamma.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/cmsgamma.c b/src/cmsgamma.c index cb6e700..9fdf79e 100644 --- a/src/cmsgamma.c +++ b/src/cmsgamma.c @@ -991,11 +991,20 @@ cmsBool CMSEXPORT cmsSmoothToneCurve(cmsToneCurve* Tab, cmsFloat64Number lambda if (z[i] == 0.) Zeros++; if (z[i] >= 65535.) Poles++; - if (z[i] < z[i-1]) return FALSE; // Non-Monotonic + if (z[i] < z[i-1]) { + cmsSignalError(Tab ->InterpParams->ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Non-Monotonic."); + return FALSE; + } } - if (Zeros > (nItems / 3)) return FALSE; // Degenerated, mostly zeros - if (Poles > (nItems / 3)) return FALSE; // Degenerated, mostly poles + if (Zeros > (nItems / 3)) { + cmsSignalError(Tab ->InterpParams->ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Degenerated, mostly zeros."); + return FALSE; + } + if (Poles > (nItems / 3)) { + cmsSignalError(Tab ->InterpParams->ContextID, cmsERROR_RANGE, "cmsSmoothToneCurve: Degenerated, mostly poles."); + return FALSE; + } // Seems ok for (i=0; i < nItems; i++) { -- 1.8.1.4