File evolution-2.24.5-zero_size_images.patch of Package mingw32-evolution

Overview Repositories Revisions Requests Users Attributes Meta

File evolution-2.24.5-zero_size_images.patch of Package mingw32-evolution (Revision 5ee753e7c1d9900ca990c8c7a03529ea)

Currently displaying revision 5ee753e7c1d9900ca990c8c7a03529ea , Show latest

--- mail/em-format-html.c	2009/02/09 10:59:29	37236
+++ mail/em-format-html.c	2009/02/11 10:02:02	37246
@@ -523,6 +523,10 @@
 		costream = camel_data_cache_add(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
 
 	do {
+		if (camel_operation_cancel_check (NULL)) {
+			n = -1;
+			break;
+		}
 		/* FIXME: progress reporting in percentage, can we get the length always?  do we care? */
 		n = camel_stream_read(instream, buffer, sizeof (buffer));
 		if (n > 0) {
@@ -533,17 +537,12 @@
 				camel_operation_progress(NULL, pc_complete);
 			}
 			d(printf("  read %d bytes\n", n));
-			if (costream && camel_stream_write(costream, buffer, n) == -1) {
-				camel_data_cache_remove(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
-				camel_object_unref(costream);
-				costream = NULL;
+			if (costream && camel_stream_write (costream, buffer, n) == -1) {
+				n = -1;
+				break;
 			}
 
 			camel_stream_write(job->stream, buffer, n);
-		} else if (n < 0 && costream) {
-			camel_data_cache_remove(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
-			camel_object_unref(costream);
-			costream = NULL;
 		}
 	} while (n>0);
 
@@ -551,8 +550,12 @@
 	if (n == 0)
 		camel_stream_close(job->stream);
 
-	if (costream)
+	if (costream) {
+		/* do not store broken files in a cache */
+		if (n != 0)
+			camel_data_cache_remove(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
 		camel_object_unref(costream);
+	}
 
 	camel_object_unref(instream);
 done:

Places

File evolution-2.24.5-zero_size_images.patch of Package mingw32-evolution (Revision 5ee753e7c1d9900ca990c8c7a03529ea)

Places