Fix errno reset issue

svn path=/trunk/; revision=33516

2 files changed, 3 insertions, 3 deletions

diff --git a/mail/mail-config.c b/mail/mail-config.c
index a79b247196..d304a5d7f6 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -1101,9 +1101,9 @@ mail_config_signature_run_script (const char *script)
 		g_warning ("Could not execute %s: %s\n", script, g_strerror (errno));
 		_exit (255);
 	} else if (pid < 0) {
+		g_warning ("Failed to create create child process '%s': %s", script, g_strerror (errno));
 		close (in_fds [0]);
 		close (in_fds [1]);
-		g_warning ("Failed to create create child process '%s': %s", script, g_strerror (errno));
 		return NULL;
 	} else {
 		CamelStreamFilter *filtered_stream;
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 0cf5ff6caa..534f6673cd 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -143,10 +143,10 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 	}
 	
 	if (output_buffer && pipe (out_fds) == -1) {
-		close (fds [0]);
-		close (fds [1]);
 		errnosav = errno;
 		d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno)));
+		close (fds [0]);
+		close (fds [1]);
 		errno = errnosav;
 		return rv_err;
 	}