diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc
index fb7c9aee7..16f6a7246 100644
--- a/rtengine/imageio.cc
+++ b/rtengine/imageio.cc
@@ -1226,19 +1226,27 @@ int ImageIO::saveJPEG (const Glib::ustring &fname, int quality, int subSamp) con
 
     jpeg_start_compress(&cinfo, TRUE);
 
-    // buffer for exif and iptc markers
-    unsigned char* buffer;
-    unsigned int size;
+    // buffer for exif marker
+    unsigned char* exifBuffer = nullptr;
+    unsigned int exifBufferSize = 0;
 
     // assemble and write exif marker
     if (exifRoot) {
-        rtexif::ExifManager::createJPEGMarker (exifRoot, *exifChange, cinfo.image_width, cinfo.image_height, buffer, size);
+        rtexif::ExifManager::createJPEGMarker (exifRoot, *exifChange, cinfo.image_width, cinfo.image_height, exifBuffer, exifBufferSize);
 
-        if (size > 0 && size < 65530) {
-            jpeg_write_marker(&cinfo, JPEG_APP0 + 1, buffer, size);
+        if (exifBufferSize > 0 && exifBufferSize < 65530) {
+            jpeg_write_marker(&cinfo, JPEG_APP0 + 1, exifBuffer, exifBufferSize);
         }
+
     }
 
+    if (exifBuffer != nullptr) {
+        delete [] exifBuffer;
+    }
+
+    // buffer for iptc marker
+    unsigned char* iptcBuffer = new unsigned char[65535];
+
     // assemble and write iptc marker
     if (iptc) {
         unsigned char* iptcdata;
@@ -1254,7 +1262,7 @@ int ImageIO::saveJPEG (const Glib::ustring &fname, int quality, int subSamp) con
 
         int bytes = 0;
 
-        if (!error && (bytes = iptc_jpeg_ps3_save_iptc (nullptr, 0, iptcdata, size, buffer, 65532)) < 0) {
+        if (!error && (bytes = iptc_jpeg_ps3_save_iptc (nullptr, 0, iptcdata, size, iptcBuffer, 65532)) < 0) {
             error = true;
         }
 
@@ -1263,11 +1271,11 @@ int ImageIO::saveJPEG (const Glib::ustring &fname, int quality, int subSamp) con
         }
 
         if (!error) {
-            jpeg_write_marker(&cinfo, JPEG_APP0 + 13, buffer, bytes);
+            jpeg_write_marker(&cinfo, JPEG_APP0 + 13, iptcBuffer, bytes);
         }
     }
 
-    delete [] buffer;
+    delete [] iptcBuffer;
 
     // write icc profile to the output
     if (profileData) {