commit 0edb697b384716a286b4a8916ff4e81957fe1dfc
author Yati Sagade <yati.sagade@gmail.com> Mon Oct 15 15:14:02 2012 -0400
committer Jeff Muizelaar <jmuizelaar@mozilla.com> Mon Oct 15 15:21:36 2012 -0400
tree bb0c8aa81722190e335596f9ce476fdc2b9af9d7
parent 6f576f2637c7dd840431c96ecdf274f8cf871d19

Fix white_point_from_temp to handle out of range input.

Mozilla bug 550969

iccread.c

diff --git a/iccread.c b/iccread.c
index 36b7011..ff0572f 100644
--- a/iccread.c
+++ b/iccread.c
@@ -917,6 +917,8 @@
 
 /* from lcms: cmsWhitePointFromTemp */
 /* tempK must be >= 4000. and <= 25000.
+ * Invalid values of tempK will return
+ * (x,y,Y) = (-1.0, -1.0, -1.0)
  * similar to argyll: icx_DTEMP2XYZ() */
 static qcms_CIE_xyY white_point_from_temp(int temp_K)
 {
@@ -938,7 +940,14 @@
 		if (T > 7000.0 && T <= 25000.0) {
 			x = -2.0064*(1E9/T3) + 1.9018*(1E6/T2) + 0.24748*(1E3/T) + 0.237040;
 		} else {
+			// Invalid tempK
+			white_point.x = -1.0;
+			white_point.y = -1.0;
+			white_point.Y = -1.0;
+
 			assert(0 && "invalid temp");
+
+			return white_point;
 		}
 	}