Merge cedar into mozilla-central

modules/libpr0n/decoders/nsJPEGDecoder.cpp

@@ -84,20 +84,6 @@ static PRLogModuleInfo *gJPEGDecoderAccountingLog = PR_NewLogModule("JPEGDecoder
 #define gJPEGDecoderAccountingLog
 #endif
 
-static qcms_profile*
-GetICCProfile(struct jpeg_decompress_struct &info)
-{
-  JOCTET* profilebuf;
-  PRUint32 profileLength;
-  qcms_profile* profile = nsnull;
-
-  if (read_icc_profile(&info, &profilebuf, &profileLength)) {
-    profile = qcms_profile_from_memory(profile, profileLength);
-    free(profilebuf);
-  }
-
-  return profile;
-}
 
 METHODDEF(void) init_source (j_decompress_ptr jd);
 METHODDEF(boolean) fill_input_buffer (j_decompress_ptr jd);
@@ -262,8 +248,14 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount)
       return;
 
     /* We're doing a full decode. */
-    if (mCMSMode != eCMSMode_Off &&
-        (mInProfile = GetICCProfile(mInfo)) != nsnull) {
+    JOCTET  *profile;
+    PRUint32 profileLength;
+
+    if ((mCMSMode != eCMSMode_Off) &&
+        read_icc_profile(&mInfo, &profile, &profileLength) &&
+        (mInProfile = qcms_profile_from_memory(profile, profileLength)) != NULL) {
+      free(profile);
+
       PRUint32 profileSpace = qcms_profile_get_color_space(mInProfile);
       PRBool mismatch = PR_FALSE;
 

modules/libpr0n/test/crashtests/crashtests.list

@@ -10,6 +10,3 @@ load invalid-size-second-frame.gif
 # Animated gifs with a very large canvas, but tiny actual content.
 asserts(2) load delaytest.html?523528-1.gif # Bug 564231
 load delaytest.html?523528-2.gif
-
-# this would have exposed the leak discovered in bug 642902
-load invalid-icc-profile.jpg