Stop the queue if error saving, Issue 2257 and Segfault on indexed PNG, Issue 2556

2014-11-28 00:09:55 +01:00
parent fb6861e481
commit 5980774a76
6 changed files with 154 additions and 68 deletions
--- a/rtengine/iccjpeg.cc
+++ b/rtengine/iccjpeg.cc
@@ -70,8 +70,7 @@ write_icc_profile (j_compress_ptr cinfo,
    icc_data_len -= length;

    /* Write the JPEG marker header (APP2 code and marker length) */
-    jpeg_write_m_header(cinfo, ICC_MARKER,
-			(unsigned int) (length + ICC_OVERHEAD_LEN));
+    jpeg_write_m_header(cinfo, ICC_MARKER, (unsigned int) (length + ICC_OVERHEAD_LEN));

    /* Write the marker identifying string "ICC_PROFILE" (null-terminated).
     * We code it in this less-than-transparent way so that the code works