lcms: Sanitize floating point read

third_party/lcms2-2.6/src/cmsplugin.c

 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
 //  Copyright (c) 1998-2010 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
 // to deal in the Software without restriction, including without limitation
 // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // and/or sell copies of the Software, and to permit persons to whom the Software
@@ skipping 164 matching lines @@
     if (io -> Read(io, &tmp, sizeof(cmsFloat32Number), 1) != 1)
             return FALSE;
 
     if (n != NULL) {
 
         tmp = _cmsAdjustEndianess32(tmp);
         *n = *(cmsFloat32Number*) &tmp;
         if (isnan(*n))
             return FALSE;
     }
-    return TRUE;
+
+    // fpclassify() required by C99
+    return ((fpclassify(*n) == FP_ZERO) || (fpclassify(*n) == FP_NORMAL));

[Tom Sepez, 2016/12/16 18:27:34]

nit: overparenthesized (2 levels).

[kcwu, 2016/12/17 03:32:06]

Done.

 }
 
 
 cmsBool CMSEXPORT   _cmsReadUInt64Number(cmsIOHANDLER* io, cmsUInt64Number* n)
 {
     cmsUInt64Number tmp;
 
     _cmsAssert(io != NULL);
 
     if (io -> Read(io, &tmp, sizeof(cmsUInt64Number), 1) != 1)
@@ skipping 752 matching lines @@
         // free the memory block itself
         _cmsFree(&fakeContext, ctx);
     }
 }
 
 // Returns the user data associated to the given ContextID, or NULL if no user data was attached on context creation
 void* CMSEXPORT cmsGetContextUserData(cmsContext ContextID)
 {
     return _cmsContextGetClientChunk(ContextID, UserPtr);
 }