[evolution-data-server/gnome-3-36] Revert "IMAPx: Correct ref/unref imbalance on a GConverter in/out base streams"
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/gnome-3-36] Revert "IMAPx: Correct ref/unref imbalance on a GConverter in/out base streams"
- Date: Thu, 2 Jul 2020 12:46:12 +0000 (UTC)
commit de96b4a1d66d20e6c0523f715773cf1b1e5f7d71
Author: Milan Crha <mcrha redhat com>
Date: Thu Jul 2 14:44:58 2020 +0200
Revert "IMAPx: Correct ref/unref imbalance on a GConverter in/out base streams"
Even it did not crash when testing, it did crash later. The in/out
streams here are not new streams, they are owned by other object.
This reverts commit b6866f7cebe96c66ad13771f899f953ff01c4d4c.
src/camel/providers/imapx/camel-imapx-server.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
index 7cbf5db82..816c6e66e 100644
--- a/src/camel/providers/imapx/camel-imapx-server.c
+++ b/src/camel/providers/imapx/camel-imapx-server.c
@@ -2647,12 +2647,10 @@ imapx_server_set_streams (CamelIMAPXServer *is,
/* The logger produces debugging output. */
logger = camel_imapx_logger_new (is->priv->tagprefix);
- temp_stream = g_converter_input_stream_new (input_stream, logger);
- g_object_unref (input_stream);
+ input_stream = g_converter_input_stream_new (
+ input_stream, logger);
g_clear_object (&logger);
- input_stream = temp_stream;
-
/* Buffer the input stream for parsing. */
temp_stream = camel_imapx_input_stream_new (input_stream);
camel_binding_bind_property (
@@ -2664,15 +2662,11 @@ imapx_server_set_streams (CamelIMAPXServer *is,
}
if (output_stream != NULL) {
- GOutputStream *temp_stream;
-
/* The logger produces debugging output. */
logger = camel_imapx_logger_new (is->priv->tagprefix);
- temp_stream = g_converter_output_stream_new (output_stream, logger);
- g_object_unref (output_stream);
+ output_stream = g_converter_output_stream_new (
+ output_stream, logger);
g_clear_object (&logger);
-
- output_stream = temp_stream;
}
g_mutex_lock (&is->priv->stream_lock);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]