Always remove local images from Litehtml image cache

Since their "url" in cache only includes MIME
file name, they are not guaranteed to be unique
across different messages.

diff --git a/src/plugins/litehtml_viewer/container_linux_images.cpp b/src/plugins/litehtml_viewer/container_linux_images.cpp
index 2c9d91d90533d4d0604d006e7e1f7cfdeecbd7b2..5c6f7f6864f19968722f4d9cb2b1f2ed3256feba 100644 (file)
--- a/src/plugins/litehtml_viewer/container_linux_images.cpp
+++ b/src/plugins/litehtml_viewer/container_linux_images.cpp
@@ -214,7 +214,19 @@ gint container_linux::clear_images(gint desired_size)
 
        lock_images_cache();
 
-       /* First, tally up size of all the stored GdkPixbufs and
+       /* First, remove all local images - the ones with "cid:"
+        * URL. We will remove their list elements later. */
+       for (auto i = m_images.rbegin(); i != m_images.rend(); ++i) {
+               image *img = &(*i);
+
+               if (!strncmp(img->first.c_str(), "cid:", 4)) {
+                       g_object_unref(img->second);
+                       img->second = NULL;
+                       num++;
+               }
+       }
+
+       /* Now tally up size of all the stored GdkPixbufs and
         * deallocate those which make the total size be above
         * the desired_size limit. We will remove their list
         * elements later. */